X-Git-Url: http://git.scottworley.com/syncthing-autoregister/blobdiff_plain/ff8eb13963762138a5193811192cedad0a5c6172..4ac4946095213d617adde6b5e7067298c61e6df9:/tests/automatic-enrollment.nix

diff --git a/tests/automatic-enrollment.nix b/tests/automatic-enrollment.nix
index 5ab4efa..617f672 100644
--- a/tests/automatic-enrollment.nix
+++ b/tests/automatic-enrollment.nix
@@ -57,31 +57,41 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
 
 
       def verifyDeviceIDSet(machine, expectedDevice):
-          machine.succeed(
+          machine.wait_until_succeeds(
               '(( "$(nix eval --raw -f "<nixos/nixos>" config.services.syncthing.declarative.devices.%s.id | wc -c)" == 63 ))'
               % expectedDevice
           )
 
 
+      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}"),
-      )
-
+      start_all()
       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}")
+      b.wait_for_unit("syncthing-autoregister.service")
+      putDeviceFile(b)
       setConfig(b, configurationWithDeviceIDs)
       verifyDeviceIDSet(b, "a")
+      verifyDeviceIDSet(b, "b")
     '';
   })