Follow renames in test data

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

diff --git a/tests/automatic-enrollment.nix b/tests/automatic-enrollment.nix
index 4ff3670a3df0c35a53522b48f2c3ffe1730cfaa3..510b5c9ec9db3c088c9517cb720d015595130ae5 100644 (file)
--- a/tests/automatic-enrollment.nix
+++ b/tests/automatic-enrollment.nix
@@ -1,11 +1,11 @@
 import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
   let
     deviceIDFilename = "/tmp/syncthing-auto-register-test-device-ids.nix";
 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" ''
+    vmConfiguration = pkgs.writeText "vm-configuration.nix" ''

       { pkgs, ... }: {
         imports = [
       { pkgs, ... }: {
         imports = [

+          ${../.}/lib/test-nixos-rebuild-switch-config.nix

           ${../.}/modules/syncthing-autoregister.nix
           ${../.}/modules/syncthing-autoregister.nix

-          <nixos/nixos/modules/installer/cd-dvd/channel.nix>

         ];
         services.syncthing = {
           enable = true;
         ];
         services.syncthing = {
           enable = true;


@@ -15,37 +15,76 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
             path = "${deviceIDFilename}";
           };
         };
             path = "${deviceIDFilename}";
           };
         };

+
+        # For verifyDeviceIDSet()

         environment.systemPackages = with pkgs; [ nix ];
       }
     '';
         environment.systemPackages = with pkgs; [ nix ];
       }
     '';

-    initialConfiguration = pkgs.writeText "initial-configuration.nix" ''
-      {
-        imports = [ "${configuration}" ];
+
+    evaluatedVMConfiguration = import <nixos/nixos/lib/eval-config.nix> {
+      system = builtins.currentSystem;
+      modules = [ "${vmConfiguration}" ];
+    };
+
+    # Also include a syncthing configuration with a device id
+    # because using this feature pulls in additional dependencies.
+    evaluatedSyncthingDeclarativeConfiguration = import <nixos/nixos/lib/eval-config.nix> {
+      system = builtins.currentSystem;
+      modules = [
+        ../lib/test-nixos-rebuild-switch-config.nix
+        {
+          services.syncthing = {
+            enable = true;
+            settings.folders.forDeps.path = "/nope";
+          };
+        }
+      ];
+    };
+
+    initialConfiguration = {
+        imports = [ "${vmConfiguration}" ];
+        virtualisation.memorySize = 2048;

         system.activationScripts.installInitialConfiguration = {
         system.activationScripts.installInitialConfiguration = {

-          text = '''
+          text = ''

             mkdir -p /etc/nixos
             mkdir -p /etc/nixos

-            cp "${configuration}" /etc/nixos/configuration.nix
-          ''';
+            cp "${vmConfiguration}" /etc/nixos/configuration.nix
+          '';

           deps = [ ];
         };
           deps = [ ];
         };

-      }
-    '';
+        system.extraDependencies = [
+          evaluatedVMConfiguration.config.system.build.toplevel
+          evaluatedSyncthingDeclarativeConfiguration.config.system.build.toplevel
+        ];
+      };
+

     configurationWithDeviceIDs =
       pkgs.writeText "configuration-with-device-ids.nix" ''
         {
           imports = [
     configurationWithDeviceIDs =
       pkgs.writeText "configuration-with-device-ids.nix" ''
         {
           imports = [

-            ${configuration}
+            ${vmConfiguration}

             ${deviceIDFilename}
           ];
         }
       '';
             ${deviceIDFilename}
           ];
         }
       '';

+
+    configurationWithFolder =
+      pkgs.writeText "configuration-with-folder.nix" ''
+        { config, ... }: {
+          imports = [ ${configurationWithDeviceIDs} ];
+          services.syncthing.settings.folders.foo = {
+            devices = [ "a" "b" ];
+            path = "''${config.services.syncthing.dataDir}/foo";
+          };
+        }
+      '';
+

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

-      a = "${initialConfiguration}";
-      b = "${initialConfiguration}";
+      a = initialConfiguration;
+      b = initialConfiguration;

     };
 
     testScript = ''
     };
 
     testScript = ''


@@ -57,30 +96,57 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
 
 
       def verifyDeviceIDSet(machine, expectedDevice):
 
 
       def verifyDeviceIDSet(machine, expectedDevice):

-          machine.succeed(
-              '(( "$(nix eval --raw -f "<nixos/nixos>" config.services.syncthing.declarative.devices.%s.id | wc -c)" == 63 ))'
+          machine.wait_until_succeeds(
+              '(( "$(nix --experimental-features nix-command eval --impure --raw --expr "(import <nixos/nixos> {}).config.services.syncthing.settings.devices.%s.id" | wc -c)" == 63 ))'

               % expectedDevice
           )
 
 
               % 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}"
       )

+      configurationWithFolder = (
+          "${configurationWithFolder}"
+      )

 
 

+      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")

-      a.copy_from_vm("${deviceIDFilename}")
+      getDeviceFile(a)

 
 

-      b.copy_from_host(
-          os.path.join(
-              os.environ["out"],
-              os.path.basename("${deviceIDFilename}"),
-          ),
-          "${deviceIDFilename}",
-      )
-      b.succeed("chown syncthing ${deviceIDFilename}")
+      b.wait_for_unit("syncthing-autoregister.service")
+      putDeviceFile(b)

       setConfig(b, configurationWithDeviceIDs)
       verifyDeviceIDSet(b, "a")
       setConfig(b, configurationWithDeviceIDs)
       verifyDeviceIDSet(b, "a")

+      verifyDeviceIDSet(b, "b")
+
+      getDeviceFile(b)
+      putDeviceFile(a)
+      setConfig(a, configurationWithFolder)
+      setConfig(b, configurationWithFolder)
+      a.succeed("nixos-rebuild switch")
+      b.succeed("nixos-rebuild switch")
+      a.wait_for_file("/var/lib/syncthing/foo")
+      b.wait_for_file("/var/lib/syncthing/foo")
+      a.succeed("echo a2b > /var/lib/syncthing/foo/a2b")
+      b.succeed("echo b2a > /var/lib/syncthing/foo/b2a")
+      a.wait_for_file("/var/lib/syncthing/foo/b2a")
+      b.wait_for_file("/var/lib/syncthing/foo/a2b")

     '';
   })
     '';
   })