summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-11-16 16:34:22 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-12-08 18:33:00 +0100
commit2b4715d3efad02ceb0d1959822cf928c50dfefd2 (patch)
tree2ac0c92f330f2e7787460660dbcb8b727e5929ce /tests
parent860cbf7890a303b35b97e6c5c2c77d8d7bd609d9 (diff)
downloadnixpkgs-2b4715d3efad02ceb0d1959822cf928c50dfefd2.tar
nixpkgs-2b4715d3efad02ceb0d1959822cf928c50dfefd2.tar.gz
nixpkgs-2b4715d3efad02ceb0d1959822cf928c50dfefd2.tar.bz2
nixpkgs-2b4715d3efad02ceb0d1959822cf928c50dfefd2.tar.lz
nixpkgs-2b4715d3efad02ceb0d1959822cf928c50dfefd2.tar.xz
nixpkgs-2b4715d3efad02ceb0d1959822cf928c50dfefd2.tar.zst
nixpkgs-2b4715d3efad02ceb0d1959822cf928c50dfefd2.zip
Installer test: fix nix-push call
http://hydra.nixos.org/build/3331147
Diffstat (limited to 'tests')
-rw-r--r--tests/installer.nix8
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/installer.nix b/tests/installer.nix
index 65542ae862e..e5b47c73005 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -111,11 +111,9 @@ let
         # to simulate the Nixpkgs channel.
         $webserver->start;
         $webserver->waitForJob("httpd");
-        $webserver->mustSucceed("mkdir /tmp/channel");
-        $webserver->mustSucceed(
-            "nix-push file:///tmp/channel " .
-            "http://nixos.org/releases/nixos/channels/nixos-unstable " .
-            "file:///tmp/channel/MANIFEST ${toString channelContents} >&2");
+        $webserver->succeed(
+            "nix-push --bzip2 --dest /tmp/channel --manifest --url-prefix http://nixos.org/channels/nixos-unstable " .
+            "${toString channelContents} >&2");
       ''}
 
       # Make sure that we get a login prompt etc.