diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-02-23 23:41:26 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-02-24 00:01:34 +0100 |
commit | 12d720fd1a9c43019f2d5afa051b45c7633b3ab0 (patch) | |
tree | b79f77aadfa44872d5c5aaf69ca99d6756f57c92 /tests/derivations.scm | |
parent | 49685cae2bbe0384d4e0e46d38e9d0e1327e5225 (diff) | |
download | guix-12d720fd1a9c43019f2d5afa051b45c7633b3ab0.tar.gz |
tests: Factorize the network reachability test.
* guix/tests.scm (network-reachable?): New procedure. * tests/builders.scm (network-reachable?): Remove. Replace references to it with calls to the new 'network-reachable?' procedure. * tests/derivations.scm (%coreutils): Use 'network-reachable?' instead of 'getaddrinfo'. * tests/packages.scm: Likewise. * tests/union.scm: Likewise.
Diffstat (limited to 'tests/derivations.scm')
-rw-r--r-- | tests/derivations.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/derivations.scm b/tests/derivations.scm index e23bdeed77..72d253c465 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -463,7 +463,7 @@ (define %coreutils (false-if-exception - (and (getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV) + (and (network-reachable?) (or (package-derivation %store %bootstrap-coreutils&co) (nixpkgs-derivation "coreutils"))))) |