qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etc: extend tests to ensure that temporary dirs are cleaned up

Browse Source
This commit is contained in:
r-vdp 2024-09-05 15:28:46 +02:00
parent 0f786baf5d
commit 65f375d172
No known key found for this signature in database
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos/tests/activation/etc-overlay-immutable.nix
View File

@ -27,9 +27,14 @@
specialisation.new-generation.configuration = { specialisation.new-generation.configuration = {
environment.etc."newgen".text = "newgen"; environment.etc."newgen".text = "newgen";
}; };
specialisation.newer-generation.configuration = {
environment.etc."newergen".text = "newergen";
};
}; };
testScript = '' testScript = /* python */ ''
newergen = machine.succeed("realpath /run/current-system/specialisation/newer-generation/bin/switch-to-configuration").rstrip()
with subtest("/run/etc-metadata/ is mounted"): with subtest("/run/etc-metadata/ is mounted"):
print(machine.succeed("mountpoint /run/etc-metadata")) print(machine.succeed("mountpoint /run/etc-metadata"))
@ -79,5 +84,13 @@
print(machine.succeed("ls /etc/mountpoint")) print(machine.succeed("ls /etc/mountpoint"))
print(machine.succeed("stat /etc/mountpoint/extra-file")) print(machine.succeed("stat /etc/mountpoint/extra-file"))
print(machine.succeed("findmnt /etc/filemount")) print(machine.succeed("findmnt /etc/filemount"))
machine.succeed(f"{newergen} switch")
tmpMounts = machine.succeed("find /tmp -maxdepth 1 -type d -regex '/tmp/nixos-etc\\..*' | wc -l").rstrip()
metaMounts = machine.succeed("find /tmp -maxdepth 1 -type d -regex '/tmp/nixos-etc-metadata\\..*' | wc -l").rstrip()
assert tmpMounts == "0", f"Found {tmpMounts} remaining tmpmounts"
assert metaMounts == "1", f"Found {metaMounts} remaining metamounts"
''; '';
} }

16
nixos/tests/activation/etc-overlay-mutable.nix
View File

@ -15,9 +15,14 @@
specialisation.new-generation.configuration = { specialisation.new-generation.configuration = {
environment.etc."newgen".text = "newgen"; environment.etc."newgen".text = "newgen";
}; };
specialisation.newer-generation.configuration = {
environment.etc."newergen".text = "newergen";
};
}; };
testScript = '' testScript = /* python */ ''
newergen = machine.succeed("realpath /run/current-system/specialisation/newer-generation/bin/switch-to-configuration").rstrip()
with subtest("/run/etc-metadata/ is mounted"): with subtest("/run/etc-metadata/ is mounted"):
print(machine.succeed("mountpoint /run/etc-metadata")) print(machine.succeed("mountpoint /run/etc-metadata"))
@ -55,5 +60,14 @@
print(machine.succeed("findmnt /etc/mountpoint")) print(machine.succeed("findmnt /etc/mountpoint"))
print(machine.succeed("stat /etc/mountpoint/extra-file")) print(machine.succeed("stat /etc/mountpoint/extra-file"))
print(machine.succeed("findmnt /etc/filemount")) print(machine.succeed("findmnt /etc/filemount"))
machine.succeed(f"{newergen} switch")
assert machine.succeed("cat /etc/newergen") == "newergen"
tmpMounts = machine.succeed("find /tmp -maxdepth 1 -type d -regex '/tmp/nixos-etc\\..*' | wc -l").rstrip()
metaMounts = machine.succeed("find /tmp -maxdepth 1 -type d -regex '/tmp/nixos-etc-metadata\\..*' | wc -l").rstrip()
assert tmpMounts == "0", f"Found {tmpMounts} remaining tmpmounts"
assert metaMounts == "1", f"Found {metaMounts} remaining metamounts"
''; '';
} }