diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-14 14:09:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-14 14:09:54 -0500 |
| commit | 5bb3eaa223215d81805595b2abdba63bb4790cf9 (patch) | |
| tree | 006b7d7bedbe3ff537266d24c3f3088c11d9157e /nixos | |
| parent | f2c62a920f99c7f657dd1e84ee6ce58bfea1775c (diff) | |
| parent | 32e3d156386895bbe96dfcf33bcfc59fe3dca78b (diff) | |
| download | nixpkgs-5bb3eaa223215d81805595b2abdba63bb4790cf9.tar nixpkgs-5bb3eaa223215d81805595b2abdba63bb4790cf9.tar.gz nixpkgs-5bb3eaa223215d81805595b2abdba63bb4790cf9.tar.bz2 nixpkgs-5bb3eaa223215d81805595b2abdba63bb4790cf9.tar.lz nixpkgs-5bb3eaa223215d81805595b2abdba63bb4790cf9.tar.xz nixpkgs-5bb3eaa223215d81805595b2abdba63bb4790cf9.tar.zst nixpkgs-5bb3eaa223215d81805595b2abdba63bb4790cf9.zip | |
Merge pull request #80130 from tfc/port-krb5-test
nixosTests.krb5: Port to python
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/all-tests.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/krb5/deprecated-config.nix | 6 | ||||
| -rw-r--r-- | nixos/tests/krb5/example-config.nix | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 671f87a4394..a854365f752 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -145,6 +145,7 @@ in kernel-testing = handleTest ./kernel-testing.nix {}; keymap = handleTest ./keymap.nix {}; knot = handleTest ./knot.nix {}; + krb5 = discoverTests (import ./krb5 {}); kubernetes.dns = handleTestOn ["x86_64-linux"] ./kubernetes/dns.nix {}; # kubernetes.e2e should eventually replace kubernetes.rbac when it works #kubernetes.e2e = handleTestOn ["x86_64-linux"] ./kubernetes/e2e.nix {}; diff --git a/nixos/tests/krb5/deprecated-config.nix b/nixos/tests/krb5/deprecated-config.nix index 7d7926309c9..be6ebce9e05 100644 --- a/nixos/tests/krb5/deprecated-config.nix +++ b/nixos/tests/krb5/deprecated-config.nix @@ -1,7 +1,7 @@ # Verifies that the configuration suggested in deprecated example values # will result in the expected output. -import ../make-test.nix ({ pkgs, ...} : { +import ../make-test-python.nix ({ pkgs, ...} : { name = "krb5-with-deprecated-config"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ eqyiel ]; @@ -43,6 +43,8 @@ import ../make-test.nix ({ pkgs, ...} : { ''; in '' - $machine->succeed("diff /etc/krb5.conf ${snapshot}"); + machine.succeed( + "diff /etc/krb5.conf ${snapshot}" + ) ''; }) diff --git a/nixos/tests/krb5/example-config.nix b/nixos/tests/krb5/example-config.nix index f01cf6988ee..be195b51393 100644 --- a/nixos/tests/krb5/example-config.nix +++ b/nixos/tests/krb5/example-config.nix @@ -1,7 +1,7 @@ # Verifies that the configuration suggested in (non-deprecated) example values # will result in the expected output. -import ../make-test.nix ({ pkgs, ...} : { +import ../make-test-python.nix ({ pkgs, ...} : { name = "krb5-with-example-config"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ eqyiel ]; @@ -101,6 +101,8 @@ import ../make-test.nix ({ pkgs, ...} : { default = SYSLOG:NOTICE ''; in '' - $machine->succeed("diff /etc/krb5.conf ${snapshot}"); + machine.succeed( + "diff /etc/krb5.conf ${snapshot}" + ) ''; }) |