Merge pull request #80130 from tfc/port-krb5-test

nixosTests.krb5: Port to python
This commit is contained in:
worldofpeace 2020-02-14 14:09:54 -05:00 committed by GitHub
commit 5bb3eaa223
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions

View File

@ -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 {};

View File

@ -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}"
)
'';
})

View File

@ -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}"
)
'';
})