From 3b2e6e72faff6255230b17991eb545824b00630f Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Sat, 27 Nov 2021 21:04:28 +1300
Subject: [PATCH] tests: Move all PAM tests into a separate directory

As per
<https://github.com/NixOS/nixpkgs/pull/146467#issuecomment-972743535>.
---
 nixos/tests/all-tests.nix                              | 6 +++---
 nixos/tests/pam/{default.nix => pam-file-contents.nix} | 0
 nixos/tests/{ => pam}/pam-oath-login.nix               | 2 +-
 nixos/tests/{ => pam}/pam-u2f.nix                      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename nixos/tests/pam/{default.nix => pam-file-contents.nix} (100%)
 rename nixos/tests/{ => pam}/pam-oath-login.nix (98%)
 rename nixos/tests/{ => pam}/pam-u2f.nix (91%)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index fdd751c5516b..5afe05c1b727 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -343,9 +343,9 @@ in
   osrm-backend = handleTest ./osrm-backend.nix {};
   overlayfs = handleTest ./overlayfs.nix {};
   packagekit = handleTest ./packagekit.nix {};
-  pam = handleTest ./pam/default.nix {};
-  pam-oath-login = handleTest ./pam-oath-login.nix {};
-  pam-u2f = handleTest ./pam-u2f.nix {};
+  pam-file-contents = handleTest ./pam/pam-file-contents.nix {};
+  pam-oath-login = handleTest ./pam/pam-oath-login.nix {};
+  pam-u2f = handleTest ./pam/pam-u2f.nix {};
   pantalaimon = handleTest ./matrix/pantalaimon.nix {};
   pantheon = handleTest ./pantheon.nix {};
   paperless-ng = handleTest ./paperless-ng.nix {};
diff --git a/nixos/tests/pam/default.nix b/nixos/tests/pam/pam-file-contents.nix
similarity index 100%
rename from nixos/tests/pam/default.nix
rename to nixos/tests/pam/pam-file-contents.nix
diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam/pam-oath-login.nix
similarity index 98%
rename from nixos/tests/pam-oath-login.nix
rename to nixos/tests/pam/pam-oath-login.nix
index 6d48199eda97..597596b211b1 100644
--- a/nixos/tests/pam-oath-login.nix
+++ b/nixos/tests/pam/pam-oath-login.nix
@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ ... }:
+import ../make-test-python.nix ({ ... }:
 
 let
   oathSnakeoilSecret = "cdd4083ef8ff1fa9178c6d46bfb1a3";
diff --git a/nixos/tests/pam-u2f.nix b/nixos/tests/pam/pam-u2f.nix
similarity index 91%
rename from nixos/tests/pam-u2f.nix
rename to nixos/tests/pam/pam-u2f.nix
index f492baa9e139..0ac6ac17be82 100644
--- a/nixos/tests/pam-u2f.nix
+++ b/nixos/tests/pam/pam-u2f.nix
@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ ... }:
+import ../make-test-python.nix ({ ... }:
 
 {
   name = "pam-u2f";