public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/tests/cjdns: do not build cjdns at evaluation

Browse Source 
Putting hostnames in the cjdns configuration requires a utility
be present to convert public keys to ip addresses
This commit is contained in:
Emery Hemingway 2015-03-21 10:13:03 -04:00
parent 7e66337f6c
commit ba2074fc31
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/release.nix
View File

@ -242,7 +242,7 @@ in rec {
tests.blivet = callTest tests/blivet.nix {}; tests.blivet = callTest tests/blivet.nix {};
tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; }); tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
tests.chromium = callTest tests/chromium.nix {}; tests.chromium = callTest tests/chromium.nix {};
#tests.cjdns = callTest tests/cjdns.nix {}; tests.cjdns = callTest tests/cjdns.nix {};
tests.containers = callTest tests/containers.nix {}; tests.containers = callTest tests/containers.nix {};
tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; }); tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });
tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; }); tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; });

5
nixos/tests/cjdns.nix
View File

@ -52,8 +52,7 @@ import ./make-test.nix {
{ UDPInterface = { UDPInterface =
{ bind = "0.0.0.0:1024"; { bind = "0.0.0.0:1024";
connectTo."192.168.0.1:1024}" = connectTo."192.168.0.1:1024}" =
{ hostname = "carol.hype"; { password = carolPassword;
password = carolPassword;
publicKey = carolPubKey; publicKey = carolPubKey;
}; };
}; };
@ -108,7 +107,7 @@ import ./make-test.nix {
# ping a few times each to let the routing table establish itself # ping a few times each to let the routing table establish itself
$alice->succeed("ping6 -c 4 $carolIp6"); $alice->succeed("ping6 -c 4 $carolIp6");
$bob->succeed("ping6 -c 4 carol.hype"); $bob->succeed("ping6 -c 4 $carolIp6");
$carol->succeed("ping6 -c 4 $aliceIp6"); $carol->succeed("ping6 -c 4 $aliceIp6");
$carol->succeed("ping6 -c 4 $bobIp6"); $carol->succeed("ping6 -c 4 $bobIp6");