Verify b's device ID gets set also

[syncthing-autoregister] / tests / automatic-enrollment.nix

diff --git a/tests/automatic-enrollment.nix b/tests/automatic-enrollment.nix
index 4ff3670a3df0c35a53522b48f2c3ffe1730cfaa3..951a4153e000be6bb453522fab7f4bcde415d1f4 100644 (file)
--- 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}"
       )
       configurationWithDeviceIDs = (
           "${configurationWithDeviceIDs}"
       )


@@ -70,17 +85,13 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
       a.wait_for_unit("syncthing-autoregister.service")
       setConfig(a, configurationWithDeviceIDs)
       verifyDeviceIDSet(a, "a")
       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")
       setConfig(b, configurationWithDeviceIDs)
       verifyDeviceIDSet(b, "a")

+      b.wait_for_unit("syncthing-autoregister.service")
+      verifyDeviceIDSet(b, "a")
+      verifyDeviceIDSet(b, "b")

     '';
   })
     '';
   })