mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 16:33:15 +00:00
nixos/pam: add order comment to each rule line
This commit is contained in:
parent
077cdcc7e9
commit
43f7cb4a95
@ -597,6 +597,7 @@ let
|
||||
(map (rule: concatStringsSep " " (
|
||||
[ type rule.control rule.modulePath ]
|
||||
++ map formatModuleArgument rule.args
|
||||
++ [ "# ${rule.name} (order ${toString rule.order})" ]
|
||||
)))
|
||||
(concatStringsSep "\n")
|
||||
];
|
||||
|
@ -15,9 +15,10 @@ expected_lines = {
|
||||
}
|
||||
actual_lines = set(machine.succeed("cat /etc/pam.d/chfn").splitlines())
|
||||
|
||||
missing_lines = expected_lines - actual_lines
|
||||
extra_lines = actual_lines - expected_lines
|
||||
non_functional_lines = set([line for line in extra_lines if (line == "" or line.startswith("#"))])
|
||||
stripped_lines = set([line.split("#")[0].rstrip() for line in actual_lines])
|
||||
missing_lines = expected_lines - stripped_lines
|
||||
extra_lines = stripped_lines - expected_lines
|
||||
non_functional_lines = set([line for line in extra_lines if line == ""])
|
||||
unexpected_functional_lines = extra_lines - non_functional_lines
|
||||
|
||||
with subtest("All expected lines are in the file"):
|
||||
|
Loading…
Reference in New Issue
Block a user