From 682f56bed41b8b06c4e49eebae1d33d5f331072c Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Mon, 3 Jun 2024 01:19:43 -0700 Subject: [PATCH 1/1] Follow renames in test data So tests run without rename warnings. --- lib/test-nixos-rebuild-switch-config.nix | 2 +- tests/automatic-enrollment.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/test-nixos-rebuild-switch-config.nix b/lib/test-nixos-rebuild-switch-config.nix index f6ffd60..130a808 100644 --- 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") ]; - nix.binaryCaches = lib.mkForce [ ]; + nix.settings.substituters = lib.mkForce [ ]; nix.extraOptions = '' hashed-mirrors = connect-timeout = 1 diff --git a/tests/automatic-enrollment.nix b/tests/automatic-enrollment.nix index 29a0bdf..510b5c9 100644 --- a/tests/automatic-enrollment.nix +++ b/tests/automatic-enrollment.nix @@ -35,7 +35,7 @@ import ({ pkgs, lib, ... }: { services.syncthing = { enable = true; - folders.forDeps.path = "/nope"; + settings.folders.forDeps.path = "/nope"; }; } ]; @@ -71,7 +71,7 @@ import ({ pkgs, lib, ... }: 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"; }; @@ -97,7 +97,7 @@ import ({ pkgs, lib, ... }: def verifyDeviceIDSet(machine, expectedDevice): machine.wait_until_succeeds( - '(( "$(nix --experimental-features nix-command eval --impure --raw --expr "(import {}).config.services.syncthing.declarative.devices.%s.id" | wc -c)" == 63 ))' + '(( "$(nix --experimental-features nix-command eval --impure --raw --expr "(import {}).config.services.syncthing.settings.devices.%s.id" | wc -c)" == 63 ))' % expectedDevice ) -- 2.44.1