diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/fixtures.sh | 10 | ||||
| -rw-r--r-- | tests/scenarios.nix | 45 | ||||
| -rw-r--r-- | tests/vm.nix | 2 |
3 files changed, 53 insertions, 4 deletions
diff --git a/tests/fixtures.sh b/tests/fixtures.sh index d9d8b2b..4e794db 100755 --- a/tests/fixtures.sh +++ b/tests/fixtures.sh @@ -461,3 +461,13 @@ echo keep > /fixtures/filtered-parent/sub/keep echo garbage > /fixtures/filtered-parent/sub/garbage ln -s filtered-parent /fixtures/filtered-parent-link chown -h nobody /fixtures/filtered-parent-link + +# filtered-name, filtered-name-link: like filtered, but the filter file is in +# a subdirectory whose name has a byte that rsync prints escaped in the C +# locale. +mkdir -p /fixtures/filtered-name/bär +printf -- '- garbage\n' > /fixtures/filtered-name/bär/.rsync-filter +echo keep > /fixtures/filtered-name/bär/keep +echo garbage > /fixtures/filtered-name/bär/garbage +ln -s filtered-name /fixtures/filtered-name-link +chown -h nobody /fixtures/filtered-name-link diff --git a/tests/scenarios.nix b/tests/scenarios.nix index 7743482..2fb6609 100644 --- a/tests/scenarios.nix +++ b/tests/scenarios.nix @@ -96,10 +96,11 @@ let # pass for failing for an unrelated reason, e.g. a misspelt option. # targetPath deploys to another path than the scenario's target # directory, and controlTargetPath is the control for a path that makes - # evaluation fail. + # evaluation fail. env sets environment variables for populate, as + # arguments of env. phase = { sources, backup ? false, prune ? false, deploy ? null, - targetPath ? path, + targetPath ? path, env ? "", expect ? "success", control ? null, controlTargetPath ? null, check ? "", mutate ? null, checkDeployer ? null, mutateDeployer ? null, }: let @@ -134,6 +135,7 @@ let null else { populate = toString (command sources targetPath); + inherit env; expect = if expect == "success" then null else expect.fail; # No phase gets around checking the canaries. check = script (check + "\ncanary_check\n"); @@ -337,7 +339,44 @@ assert !(krops.isLocalTarget (targets.remote "/")); ''} ''; })); - }) [ null true false ]) targetKinds; + }) [ null true false ]) targetKinds + ++ concatMap (targetKind: let + affected = lib.versionAtLeast rsyncVersion "3.5.0"; + unreadable = name: { path, file, dir ? "x", env ? "" }: scenario { + name = "file-${targetKind}-insecureLinks${name}"; + inherit targetKind; + prepare = '' + mkdir -p "$T"/${dir} + echo old > "$T"/${dir}/garbage + ''; + phases = twice ({ + sources.x.file = { inherit path; }; + inherit env; + } // (if affected then { + expect.fail = "can't read ${file}, so it would sync ${path}/ without it."; + } else { + check = '' + expect_eq keep "$(cat "$T"/${dir}/keep)" keep + test ! -e "$T"/${dir}/garbage || fail "garbage not excluded" + ''; + })); + }; + in [ + # The filter file is in the directory above what gets synced, where it + # applies as well. + (unreadable "Parent" { + path = "/fixtures/filtered-parent-link/sub"; + file = "/fixtures/filtered-parent-link/.rsync-filter"; + }) + # The filter file is in a directory whose name rsync prints escaped + # in the C locale. + (unreadable "Name" { + path = "/fixtures/filtered-name-link"; + file = "/fixtures/filtered-name-link/bär/.rsync-filter"; + dir = "x/bär"; + env = "LC_ALL=C"; + }) + ]) targetKinds; flake = matrix "flake" { kind = [ "git" "path" "subdir" "remote" ]; diff --git a/tests/vm.nix b/tests/vm.nix index 5eb4dbb..014897a 100644 --- a/tests/vm.nix +++ b/tests/vm.nix @@ -152,7 +152,7 @@ in pkgs.testers.runNixOSTest { for i, phase in enumerate(scenario["phases"]): # A hang fails the scenario, not the whole test. status, out = deployer.execute( - f"HOME=/root timeout 600 {phase['populate']} 2>&1", + f"env HOME=/root {phase['env']} timeout 600 {phase['populate']} 2>&1", timeout=900, ) if phase["expect"] is None: |