setConfig() helper

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

diff --git a/tests/automatic-enrollment.nix b/tests/automatic-enrollment.nix
index 92c90b72d0ba90b795061e9907b4d63e6357bc07..49325fa90e5f71d19270683c93f0964087b978fb 100644 (file)
--- a/tests/automatic-enrollment.nix
+++ b/tests/automatic-enrollment.nix
@@ -17,14 +17,15 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
         environment.systemPackages = with pkgs; [ nix ];
       }
     '';
-    configurationWithDeviceIDs = pkgs.writeText "configuration-with-device-ids.nix" ''
-      {
-        imports = [
-          ${configuration}
-          /tmp/syncthing-auto-register-test-device-ids.nix
-        ];
-      }
-    '';
+    configurationWithDeviceIDs =
+      pkgs.writeText "configuration-with-device-ids.nix" ''
+        {
+          imports = [
+            ${configuration}
+            /tmp/syncthing-auto-register-test-device-ids.nix
+          ];
+        }
+      '';
   in {
 
     name = "syncthing";
@@ -32,15 +33,18 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
     machine = "${configuration}";
 
     testScript = ''
-      machine.copy_from_host(
-          "${configuration}",
-          "/etc/nixos/configuration.nix",
+      def setConfig(machine, config):
+          machine.copy_from_host(config, "/etc/nixos/configuration.nix")
+
+
+      initialConfiguration = "${configuration}"
+      configurationWithDeviceIDs = (
+          "${configurationWithDeviceIDs}"
       )
+
+      setConfig(machine, initialConfiguration)
       machine.wait_for_unit("syncthing-autoregister.service")
-      machine.copy_from_host(
-          "${configurationWithDeviceIDs}",
-          "/etc/nixos/configuration.nix",
-      )
+      setConfig(machine, configurationWithDeviceIDs)
       machine.succeed(
           '(( "$(nix eval --raw -f "<nixos/nixos>" config.services.syncthing.declarative.devices.machine.id | wc -c)" == 63 ))'
       )