diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-12-09 12:10:44 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-12-09 13:03:16 +1000 |
| commit | 79e66fce1c2b5a7de3e9a0e75b591ca9552a62ef (patch) | |
| tree | ce67a92c6dee4e6a303db425d9eefccba438cbd9 /nixos/tests | |
| parent | ce82da442b5f66c26f71443e7567e1765953ea9d (diff) | |
| download | nixpkgs-79e66fce1c2b5a7de3e9a0e75b591ca9552a62ef.tar nixpkgs-79e66fce1c2b5a7de3e9a0e75b591ca9552a62ef.tar.gz nixpkgs-79e66fce1c2b5a7de3e9a0e75b591ca9552a62ef.tar.bz2 nixpkgs-79e66fce1c2b5a7de3e9a0e75b591ca9552a62ef.tar.lz nixpkgs-79e66fce1c2b5a7de3e9a0e75b591ca9552a62ef.tar.xz nixpkgs-79e66fce1c2b5a7de3e9a0e75b591ca9552a62ef.tar.zst nixpkgs-79e66fce1c2b5a7de3e9a0e75b591ca9552a62ef.zip | |
nixos/podman: sort files into directories
Makes codeowners, git history, etc. a bit simpler now that podman has expanded beyond the original single file module and test.
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/all-tests.nix | 6 | ||||
| -rw-r--r-- | nixos/tests/podman/default.nix (renamed from nixos/tests/podman.nix) | 2 | ||||
| -rw-r--r-- | nixos/tests/podman/dnsname.nix (renamed from nixos/tests/podman-dnsname.nix) | 2 | ||||
| -rw-r--r-- | nixos/tests/podman/tls-ghostunnel.nix (renamed from nixos/tests/podman-tls-ghostunnel.nix) | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 63be6789201..a1113ff631e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -369,9 +369,9 @@ in plikd = handleTest ./plikd.nix {}; plotinus = handleTest ./plotinus.nix {}; podgrab = handleTest ./podgrab.nix {}; - podman = handleTestOn ["x86_64-linux"] ./podman.nix {}; - podman-dnsname = handleTestOn ["x86_64-linux"] ./podman-dnsname.nix {}; - podman-tls-ghostunnel = handleTestOn ["x86_64-linux"] ./podman-tls-ghostunnel.nix {}; + podman = handleTestOn ["x86_64-linux"] ./podman/default.nix {}; + podman-dnsname = handleTestOn ["x86_64-linux"] ./podman/dnsname.nix {}; + podman-tls-ghostunnel = handleTestOn ["x86_64-linux"] ./podman/tls-ghostunnel.nix {}; pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {}; postfix = handleTest ./postfix.nix {}; postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {}; diff --git a/nixos/tests/podman.nix b/nixos/tests/podman/default.nix index 7eae575fd7f..b52a7f060ad 100644 --- a/nixos/tests/podman.nix +++ b/nixos/tests/podman/default.nix @@ -1,6 +1,6 @@ # This test runs podman and checks if simple container starts -import ./make-test-python.nix ( +import ../make-test-python.nix ( { pkgs, lib, ... }: { name = "podman"; meta = { diff --git a/nixos/tests/podman-dnsname.nix b/nixos/tests/podman/dnsname.nix index dd352f754dc..3768ae79e06 100644 --- a/nixos/tests/podman-dnsname.nix +++ b/nixos/tests/podman/dnsname.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ( +import ../make-test-python.nix ( { pkgs, lib, ... }: let inherit (pkgs) writeTextDir python3 curl; diff --git a/nixos/tests/podman-tls-ghostunnel.nix b/nixos/tests/podman/tls-ghostunnel.nix index 0e687b199b2..c0bc47cc40b 100644 --- a/nixos/tests/podman-tls-ghostunnel.nix +++ b/nixos/tests/podman/tls-ghostunnel.nix @@ -1,7 +1,7 @@ /* This test runs podman as a backend for the Docker CLI. */ -import ./make-test-python.nix ( +import ../make-test-python.nix ( { pkgs, lib, ... }: let gen-ca = pkgs.writeScript "gen-ca" '' |