summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2016-11-12 12:43:10 +0100
committerJoachim Fasting <joachifm@fastmail.fm>2016-11-12 13:09:17 +0100
commitf059c7f7541bda789833d5c93cb6ea3c2b346820 (patch)
treee17eed857223015b4b84a88ac35567faf2bea9d6
parent2d136204c47985c9518105e1af9e14810c8319ec (diff)
downloadnixpkgs-f059c7f7541bda789833d5c93cb6ea3c2b346820.tar
nixpkgs-f059c7f7541bda789833d5c93cb6ea3c2b346820.tar.gz
nixpkgs-f059c7f7541bda789833d5c93cb6ea3c2b346820.tar.bz2
nixpkgs-f059c7f7541bda789833d5c93cb6ea3c2b346820.tar.lz
nixpkgs-f059c7f7541bda789833d5c93cb6ea3c2b346820.tar.xz
nixpkgs-f059c7f7541bda789833d5c93cb6ea3c2b346820.tar.zst
nixpkgs-f059c7f7541bda789833d5c93cb6ea3c2b346820.zip
Revert "cjdns test: exercise host builder logic"
This reverts commit daf3ba426b2558e73ef2742fab1a73c782ef62a6.

This is an alternative to 0ba3d429a758cec15545fc11c9d3fd1424c5c5f8,
which disables the test outright.  Briefly, exercising builders which
rely on import-from-derivation can cause Hydra jobsets to time out.
-rw-r--r--nixos/tests/cjdns.nix1
1 files changed, 0 insertions, 1 deletions
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index 1cedf168dcb..f61c82b916a 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -57,7 +57,6 @@ import ./make-test.nix ({ pkgs, ...} : {
                   connectTo."192.168.0.1:1024}" =
                     { password = carolPassword;
                       publicKey = carolPubKey;
-                      hostname = "carol";
                     };
                 };
             };