X-Git-Url: http://git.scottworley.com/syncthing-autoregister/blobdiff_plain/fc02e299c578d5c3fc581426b5f84aae244cbb87..36008f17427b61f0b86143a260f748a534688ae8:/tests/automatic-enrollment.nix

diff --git a/tests/automatic-enrollment.nix b/tests/automatic-enrollment.nix
index 4ff3670..6520c9f 100644
--- a/tests/automatic-enrollment.nix
+++ b/tests/automatic-enrollment.nix
@@ -63,6 +63,21 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ 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}"
       )
@@ -70,16 +85,9 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
       a.wait_for_unit("syncthing-autoregister.service")
       setConfig(a, configurationWithDeviceIDs)
       verifyDeviceIDSet(a, "a")
-      a.copy_from_vm("${deviceIDFilename}")
+      getDeviceFile(a)
 
-      b.copy_from_host(
-          os.path.join(
-              os.environ["out"],
-              os.path.basename("${deviceIDFilename}"),
-          ),
-          "${deviceIDFilename}",
-      )
-      b.succeed("chown syncthing ${deviceIDFilename}")
+      putDeviceFile(b)
       setConfig(b, configurationWithDeviceIDs)
       verifyDeviceIDSet(b, "a")
     '';