nixos tests: bring back non-blocking nfs tests

... at least for the big combined jobset where it's easy.
I don't know what I was thinking; this is clearly a better way.
release-18.03-flake
Vladimír Čunát 2018-07-20 17:19:04 +02:00
parent d6c6c7fcec
commit 99adfd0a42
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 3 additions and 3 deletions

View File

@ -113,6 +113,7 @@ in rec {
(all nixos.tests.networking.scripted.macvlan)
(all nixos.tests.networking.scripted.sit)
(all nixos.tests.networking.scripted.vlan)
# FIXME: temporarily disabled, see #43473
#(all nixos.tests.nfs3)
#(all nixos.tests.nfs4)
(all nixos.tests.openssh)

View File

@ -334,9 +334,8 @@ in rec {
tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; };
# TODO: put in networking.nix after the test becomes more complete
tests.networkingProxy = callTest tests/networking-proxy.nix {};
# FIXME: temporarily disabled, see #43473
#tests.nfs3 = callTest tests/nfs.nix { version = 3; };
#tests.nfs4 = callTest tests/nfs.nix { version = 4; };
tests.nfs3 = callTest tests/nfs.nix { version = 3; };
tests.nfs4 = callTest tests/nfs.nix { version = 4; };
tests.nginx = callTest tests/nginx.nix { };
tests.nghttpx = callTest tests/nghttpx.nix { };
tests.nix-ssh-serve = callTest tests/nix-ssh-serve.nix { };