summary refs log tree commit diff
path: root/tests/union.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-02-23 23:41:26 +0100
committerLudovic Courtès <ludo@gnu.org>2015-02-24 00:01:34 +0100
commit12d720fd1a9c43019f2d5afa051b45c7633b3ab0 (patch)
treeb79f77aadfa44872d5c5aaf69ca99d6756f57c92 /tests/union.scm
parent49685cae2bbe0384d4e0e46d38e9d0e1327e5225 (diff)
downloadguix-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/union.scm')
-rw-r--r--tests/union.scm6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/union.scm b/tests/union.scm
index 7e55670b86..22ba67ce99 100644
--- a/tests/union.scm
+++ b/tests/union.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -84,9 +84,7 @@
                           (call-with-input-file "bar/two" get-string-all))
                 (not (file-exists? "bar/one")))))))
 
-(test-skip (if (and %store
-                    (false-if-exception
-                     (getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)))
+(test-skip (if (and %store (network-reachable?))
                0
                1))