summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorVictor Engmark <victor@engmark.name>2021-11-27 21:04:28 +1300
committerArtturin <Artturin@artturin.com>2021-11-27 20:36:50 +0200
commit3b2e6e72faff6255230b17991eb545824b00630f (patch)
tree6880ce4bf2c8f2518c75835bb64ff59806cc9bb2 /nixos
parent595543a3149b64a809da8fb4fdabbd6800d29ad4 (diff)
downloadnixpkgs-3b2e6e72faff6255230b17991eb545824b00630f.tar
nixpkgs-3b2e6e72faff6255230b17991eb545824b00630f.tar.gz
nixpkgs-3b2e6e72faff6255230b17991eb545824b00630f.tar.bz2
nixpkgs-3b2e6e72faff6255230b17991eb545824b00630f.tar.lz
nixpkgs-3b2e6e72faff6255230b17991eb545824b00630f.tar.xz
nixpkgs-3b2e6e72faff6255230b17991eb545824b00630f.tar.zst
nixpkgs-3b2e6e72faff6255230b17991eb545824b00630f.zip
tests: Move all PAM tests into a separate directory
As per
<https://github.com/NixOS/nixpkgs/pull/146467#issuecomment-972743535>.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/all-tests.nix6
-rw-r--r--nixos/tests/pam/pam-file-contents.nix (renamed from nixos/tests/pam/default.nix)0
-rw-r--r--nixos/tests/pam/pam-oath-login.nix (renamed from nixos/tests/pam-oath-login.nix)2
-rw-r--r--nixos/tests/pam/pam-u2f.nix (renamed from nixos/tests/pam-u2f.nix)2
4 files changed, 5 insertions, 5 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index fdd751c5516..5afe05c1b72 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
index 86c61003aeb..86c61003aeb 100644
--- a/nixos/tests/pam/default.nix
+++ b/nixos/tests/pam/pam-file-contents.nix
diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam/pam-oath-login.nix
index 6d48199eda9..597596b211b 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
index f492baa9e13..0ac6ac17be8 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";