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 1a6b360bc28ebd6632598b43781d42b4a591b082..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,7 +12,7 @@ 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 ];


@@ -34,7 +35,7 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
         {
           imports = [
             ${configuration}
         {
           imports = [
             ${configuration}

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

           ];
         }
       '';
           ];
         }
       '';


@@ -48,23 +49,49 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
     };
 
     testScript = ''
     };
 
     testScript = ''

+      import os
+
+

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

+      start_all()

       a.wait_for_unit("syncthing-autoregister.service")
       setConfig(a, configurationWithDeviceIDs)
       verifyDeviceIDSet(a, "a")
       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")

     '';
   })
     '';
   })