Avoid race: Install initial configuration statically

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

diff --git a/tests/automatic-enrollment.nix b/tests/automatic-enrollment.nix
index 870e6ee873801927abf0bacb17ac144fe35c3387..1a6b360bc28ebd6632598b43781d42b4a591b082 100644 (file)
--- a/tests/automatic-enrollment.nix
+++ b/tests/automatic-enrollment.nix
@@ -17,20 +17,54 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
         environment.systemPackages = with pkgs; [ nix ];
       }
     '';
+    initialConfiguration = pkgs.writeText "initial-configuration.nix" ''
+      {
+        imports = [ "${configuration}" ];
+        system.activationScripts.installInitialConfiguration = {
+          text = '''
+            mkdir -p /etc/nixos
+            cp "${configuration}" /etc/nixos/configuration.nix
+          ''';
+          deps = [ ];
+        };
+      }
+    '';
+    configurationWithDeviceIDs =
+      pkgs.writeText "configuration-with-device-ids.nix" ''
+        {
+          imports = [
+            ${configuration}
+            /tmp/syncthing-auto-register-test-device-ids.nix
+          ];
+        }
+      '';
   in {
 
     name = "syncthing";
 
-    machine = "${configuration}";
+    nodes = {
+      a = "${initialConfiguration}";
+      b = "${initialConfiguration}";
+    };
 
     testScript = ''
-      machine.copy_from_host(
-          "${configuration}",
-          "/etc/nixos/configuration.nix",
-      )
-      machine.wait_for_unit("syncthing-autoregister.service")
-      machine.succeed(
-          '(( "$(nix eval --raw -f /tmp/syncthing-auto-register-test-device-ids.nix services.syncthing.declarative.devices.machine.id | wc -c)" == 63 ))'
+      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
+          )
+
+
+      configurationWithDeviceIDs = (
+          "${configurationWithDeviceIDs}"
       )
+
+      a.wait_for_unit("syncthing-autoregister.service")
+      setConfig(a, configurationWithDeviceIDs)
+      verifyDeviceIDSet(a, "a")
     '';
   })