Follow renames in test data

So tests run without rename warnings.

diff --git a/lib/test-nixos-rebuild-switch-config.nix b/lib/test-nixos-rebuild-switch-config.nix
index f6ffd60beb5ebb37a232ada21b26fa6df75f1d33..130a8087324bd7ab9cc51be7291a3f38a4ce186b 100644 (file)
--- a/lib/test-nixos-rebuild-switch-config.nix
+++ b/lib/test-nixos-rebuild-switch-config.nix
@@ -6,7 +6,7 @@
     (modulesPath + "/virtualisation/qemu-vm.nix")
   ];
 
     (modulesPath + "/virtualisation/qemu-vm.nix")
   ];
 

-  nix.binaryCaches = lib.mkForce [ ];
+  nix.settings.substituters = lib.mkForce [ ];

   nix.extraOptions = ''
     hashed-mirrors =
     connect-timeout = 1
   nix.extraOptions = ''
     hashed-mirrors =
     connect-timeout = 1

diff --git a/tests/automatic-enrollment.nix b/tests/automatic-enrollment.nix
index 29a0bdf730cbc85c2c910038341331fc6d86d422..510b5c9ec9db3c088c9517cb720d015595130ae5 100644 (file)
--- a/tests/automatic-enrollment.nix
+++ b/tests/automatic-enrollment.nix
@@ -35,7 +35,7 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
         {
           services.syncthing = {
             enable = true;
         {
           services.syncthing = {
             enable = true;

-            folders.forDeps.path = "/nope";
+            settings.folders.forDeps.path = "/nope";

           };
         }
       ];
           };
         }
       ];


@@ -71,7 +71,7 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
       pkgs.writeText "configuration-with-folder.nix" ''
         { config, ... }: {
           imports = [ ${configurationWithDeviceIDs} ];
       pkgs.writeText "configuration-with-folder.nix" ''
         { config, ... }: {
           imports = [ ${configurationWithDeviceIDs} ];

-          services.syncthing.folders.foo = {
+          services.syncthing.settings.folders.foo = {

             devices = [ "a" "b" ];
             path = "''${config.services.syncthing.dataDir}/foo";
           };
             devices = [ "a" "b" ];
             path = "''${config.services.syncthing.dataDir}/foo";
           };


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

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

               % expectedDevice
           )
 
               % expectedDevice
           )