Commit 43f7cb4a authored by Majiir Paktu's avatar Majiir Paktu
Browse files

nixos/pam: add order comment to each rule line

parent 077cdcc7

nixos/modules/security/pam.nix

+1 −0
Original line number Diff line number Diff line
@@ -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")

        ];

nixos/tests/pam/test_chfn.py

+4 −3
Original line number Diff line number Diff line
@@ -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"):