Fix race: Re-register on file change

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

diff --git a/tests/automatic-enrollment.nix b/tests/automatic-enrollment.nix
index 870e6ee873801927abf0bacb17ac144fe35c3387..617f672e4da38f157986db9d2f7b2d1ef3be764b 100644 (file)
--- a/tests/automatic-enrollment.nix
+++ b/tests/automatic-enrollment.nix
@@ -1,5 +1,6 @@
 import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
   let
 import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
   let

+    deviceIDFilename = "/tmp/syncthing-auto-register-test-device-ids.nix";

     configuration = pkgs.writeText "configuration.nix" ''
       { pkgs, ... }: {
         imports = [
     configuration = pkgs.writeText "configuration.nix" ''
       { pkgs, ... }: {
         imports = [


@@ -11,26 +12,86 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
           openDefaultPorts = true;
           autoRegister = {
             enable = true;
           openDefaultPorts = true;
           autoRegister = {
             enable = true;

-            path = "/tmp/syncthing-auto-register-test-device-ids.nix";
+            path = "${deviceIDFilename}";

           };
         };
         environment.systemPackages = with pkgs; [ nix ];
       }
     '';
           };
         };
         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}
+            ${deviceIDFilename}
+          ];
+        }
+      '';

   in {
 
     name = "syncthing";
 
   in {
 
     name = "syncthing";
 

-    machine = "${configuration}";
+    nodes = {
+      a = "${initialConfiguration}";
+      b = "${initialConfiguration}";
+    };

 
     testScript = ''
 
     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 ))'
+      import os
+
+
+      def setConfig(machine, config):
+          machine.copy_from_host(config, "/etc/nixos/configuration.nix")
+
+
+      def verifyDeviceIDSet(machine, expectedDevice):
+          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}"

       )
       )

+
+      start_all()
+      a.wait_for_unit("syncthing-autoregister.service")
+      setConfig(a, configurationWithDeviceIDs)
+      verifyDeviceIDSet(a, "a")
+      getDeviceFile(a)
+
+      b.wait_for_unit("syncthing-autoregister.service")
+      putDeviceFile(b)
+      setConfig(b, configurationWithDeviceIDs)
+      verifyDeviceIDSet(b, "a")
+      verifyDeviceIDSet(b, "b")

     '';
   })
     '';
   })