verifyDeviceIDSet() helper

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

diff --git a/tests/automatic-enrollment.nix b/tests/automatic-enrollment.nix
index 49325fa90e5f71d19270683c93f0964087b978fb..8cbcdc446b5743b57dcc2458e000651a1e0576f9 100644 (file)
--- a/tests/automatic-enrollment.nix
+++ b/tests/automatic-enrollment.nix
@@ -30,23 +30,31 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
 
     name = "syncthing";
 
-    machine = "${configuration}";
+    nodes = {
+      a = "${configuration}";
+      b = "${configuration}";
+    };
 
     testScript = ''
       def setConfig(machine, config):
           machine.copy_from_host(config, "/etc/nixos/configuration.nix")
 
 
+      def verifyDeviceIDSet(machine, expectedDevice):
+          machine.succeed(
+              '(( "$(nix eval --raw -f "<nixos/nixos>" config.services.syncthing.declarative.devices.%s.id | wc -c)" == 63 ))'
+              % expectedDevice
+          )
+
+
       initialConfiguration = "${configuration}"
       configurationWithDeviceIDs = (
           "${configurationWithDeviceIDs}"
       )
 
-      setConfig(machine, initialConfiguration)
-      machine.wait_for_unit("syncthing-autoregister.service")
-      setConfig(machine, configurationWithDeviceIDs)
-      machine.succeed(
-          '(( "$(nix eval --raw -f "<nixos/nixos>" config.services.syncthing.declarative.devices.machine.id | wc -c)" == 63 ))'
-      )
+      setConfig(a, initialConfiguration)
+      a.wait_for_unit("syncthing-autoregister.service")
+      setConfig(a, configurationWithDeviceIDs)
+      verifyDeviceIDSet(a, "a")
     '';
   })