From: Scott Worley Date: Mon, 27 Jul 2020 23:24:05 +0000 (-0700) Subject: getDeviceFile() & putDeviceFile() X-Git-Url: http://git.scottworley.com/syncthing-autoregister/commitdiff_plain/36008f17427b61f0b86143a260f748a534688ae8?ds=inline;hp=ff8eb13963762138a5193811192cedad0a5c6172 getDeviceFile() & putDeviceFile() --- diff --git a/tests/automatic-enrollment.nix b/tests/automatic-enrollment.nix index 5ab4efa..6520c9f 100644 --- a/tests/automatic-enrollment.nix +++ b/tests/automatic-enrollment.nix @@ -63,24 +63,31 @@ import ({ pkgs, lib, ... }: ) + def getDeviceFile(machine): + machine.copy_from_vm("${deviceIDFilename}") + + + def putDeviceFile(machine): + hostDeviceIDFilename = os.path.join( + os.environ["out"], + os.path.basename("${deviceIDFilename}"), + ) + machine.copy_from_host( + hostDeviceIDFilename, "${deviceIDFilename}" + ) + machine.succeed("chown syncthing ${deviceIDFilename}") + + configurationWithDeviceIDs = ( "${configurationWithDeviceIDs}" ) - hostDeviceIDFilename = os.path.join( - os.environ["out"], - os.path.basename("${deviceIDFilename}"), - ) - a.wait_for_unit("syncthing-autoregister.service") setConfig(a, configurationWithDeviceIDs) verifyDeviceIDSet(a, "a") - a.copy_from_vm("${deviceIDFilename}") + getDeviceFile(a) - b.copy_from_host( - hostDeviceIDFilename, "${deviceIDFilename}" - ) - b.succeed("chown syncthing ${deviceIDFilename}") + putDeviceFile(b) setConfig(b, configurationWithDeviceIDs) verifyDeviceIDSet(b, "a") '';