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

* Fix the installer test (http://hydra.nixos.org/build/2430122).

Browse Source 
svn path=/nixos/trunk/; revision=33852
This commit is contained in:
Eelco Dolstra 2012-04-20 09:44:27 +00:00
parent fa50d105d7
commit d8a6cddbd0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/installer.nix
View File

@ -77,7 +77,7 @@ let
{ services.httpd.enable = true; { services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.org"; services.httpd.adminAddr = "foo@example.org";
services.httpd.servedDirs = singleton services.httpd.servedDirs = singleton
{ urlPath = "/releases/nixpkgs/channels/nixpkgs-unstable"; { urlPath = "/releases/nixos/channels/nixos-unstable";
dir = "/tmp/channel"; dir = "/tmp/channel";
}; };
@ -109,7 +109,7 @@ let
$webserver->mustSucceed("mkdir /tmp/channel"); $webserver->mustSucceed("mkdir /tmp/channel");
$webserver->mustSucceed( $webserver->mustSucceed(
"nix-push file:///tmp/channel " . "nix-push file:///tmp/channel " .
"http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable " . "http://nixos.org/releases/nixos/channels/nixos-unstable " .
"file:///tmp/channel/MANIFEST ${toString channelContents} >&2"); "file:///tmp/channel/MANIFEST ${toString channelContents} >&2");
''} ''}
@ -131,7 +131,7 @@ let
# Test nix-env. # Test nix-env.
$machine->mustFail("hello"); $machine->mustFail("hello");
$machine->mustSucceed("nix-env -i hello"); $machine->mustSucceed("nix-env -f /etc/nixos/nixpkgs -i hello");
$machine->mustSucceed("hello") =~ /Hello, world/ $machine->mustSucceed("hello") =~ /Hello, world/
or die "bad `hello' output"; or die "bad `hello' output";
''} ''}