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 46940488a952c7d87319dc737ef5fdf720ba8759..1a6b360bc28ebd6632598b43781d42b4a591b082 100644 (file)
--- a/tests/automatic-enrollment.nix
+++ b/tests/automatic-enrollment.nix
@@ -17,6 +17,18 @@ 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" ''
         {
@@ -31,8 +43,8 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
     name = "syncthing";
 
     nodes = {
-      a = "${configuration}";
-      b = "${configuration}";
+      a = "${initialConfiguration}";
+      b = "${initialConfiguration}";
     };
 
     testScript = ''
@@ -40,16 +52,19 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
           machine.copy_from_host(config, "/etc/nixos/configuration.nix")
 
 
-      initialConfiguration = "${configuration}"
+      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}"
       )
 
-      setConfig(a, initialConfiguration)
       a.wait_for_unit("syncthing-autoregister.service")
       setConfig(a, configurationWithDeviceIDs)
-      a.succeed(
-          '(( "$(nix eval --raw -f "<nixos/nixos>" config.services.syncthing.declarative.devices.a.id | wc -c)" == 63 ))'
-      )
+      verifyDeviceIDSet(a, "a")
     '';
   })