[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
37/118: Add a test for the SSH substituter
From: |
Ludovic Courtès |
Subject: |
37/118: Add a test for the SSH substituter |
Date: |
Tue, 19 May 2015 14:45:30 +0000 |
civodul pushed a commit to branch nix
in repository guix.
commit 66dbc0fdeebf509c5d919e9c12b2645136d6deeb
Author: Eelco Dolstra <address@hidden>
Date: Thu Jul 10 01:50:29 2014 +0200
Add a test for the SSH substituter
---
tests/nix-copy-closure.nix | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/tests/nix-copy-closure.nix b/tests/nix-copy-closure.nix
index bfd7084..1418c65 100644
--- a/tests/nix-copy-closure.nix
+++ b/tests/nix-copy-closure.nix
@@ -4,7 +4,7 @@
with import <nixpkgs/nixos/lib/testing.nix> { inherit system; };
-makeTest (let pkgA = pkgs.aterm; pkgB = pkgs.wget; in {
+makeTest (let pkgA = pkgs.aterm; pkgB = pkgs.wget; pkgC = pkgs.hello; in {
nodes =
{ client =
@@ -12,13 +12,14 @@ makeTest (let pkgA = pkgs.aterm; pkgB = pkgs.wget; in {
{ virtualisation.writableStore = true;
virtualisation.pathsInNixDB = [ pkgA ];
nix.package = nix;
+ nix.binaryCaches = [ ];
};
server =
{ config, pkgs, ... }:
{ services.openssh.enable = true;
virtualisation.writableStore = true;
- virtualisation.pathsInNixDB = [ pkgB ];
+ virtualisation.pathsInNixDB = [ pkgB pkgC ];
nix.package = nix;
};
};
@@ -49,6 +50,14 @@ makeTest (let pkgA = pkgs.aterm; pkgB = pkgs.wget; in {
$client->fail("nix-store --check-validity ${pkgB}");
$client->succeed("nix-copy-closure --from server --gzip ${pkgB} >&2");
$client->succeed("nix-store --check-validity ${pkgB}");
+
+ # Copy the closure of package C via the SSH substituter.
+ $client->fail("nix-store -r ${pkgC}");
+ $client->succeed(
+ "nix-store --option use-ssh-substituter true"
+ . " --option ssh-substituter-hosts address@hidden"
+ . " -r ${pkgC} >&2");
+ $client->succeed("nix-store --check-validity ${pkgC}");
'';
})
- 46/118: Fix use of sysread, (continued)
- 46/118: Fix use of sysread, Ludovic Courtès, 2015/05/19
- 33/118: Manual: html -> xhtml, Ludovic Courtès, 2015/05/19
- 45/118: nix-copy-closure -s: Do substitutions via ‘nix-store --serve’, Ludovic Courtès, 2015/05/19
- 40/118: Remove maybeVfork, Ludovic Courtès, 2015/05/19
- 50/118: Fix closure size display, Ludovic Courtès, 2015/05/19
- 38/118: Fix security hole in ‘nix-store --serve’, Ludovic Courtès, 2015/05/19
- 43/118: Remove tabs, Ludovic Courtès, 2015/05/19
- 35/118: Don't build on Ubuntu 10.10, Ludovic Courtès, 2015/05/19
- 44/118: nix-copy-closure: Fix --dry-run, Ludovic Courtès, 2015/05/19
- 47/118: Replace message "importing path <...>" with "exporting path <...>", Ludovic Courtès, 2015/05/19
- 37/118: Add a test for the SSH substituter,
Ludovic Courtès <=
- 39/118: nix-copy-closure: Fix race condition, Ludovic Courtès, 2015/05/19
- 49/118: Allow $NIX_BUILD_HOOK to be relative to Nix libexec directory, Ludovic Courtès, 2015/05/19
- 52/118: Fix test, Ludovic Courtès, 2015/05/19
- 42/118: Refactoring: Move all fork handling into a higher-order function, Ludovic Courtès, 2015/05/19
- 41/118: nix-copy-closure: Restore compression and the progress viewer, Ludovic Courtès, 2015/05/19
- 54/118: build-remote.pl: Don't keep a shell process around, Ludovic Courtès, 2015/05/19
- 57/118: Manual: Typo, Ludovic Courtès, 2015/05/19
- 53/118: build-remote.pl: Fix build log, Ludovic Courtès, 2015/05/19
- 66/118: nix-daemon: Show name of connecting user, Ludovic Courtès, 2015/05/19
- 58/118: Pass *_proxy vars to bootstrap fetchurl, Ludovic Courtès, 2015/05/19