aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-01-21 23:45:52 +0100
committerLudovic Courtès <ludo@gnu.org>2016-01-22 00:02:52 +0100
commitc74f0cb2b871f59466e6fbfbc954d8fc1cbc3c9c (patch)
tree9ba75e658aa3061ef4229aeddbe1e63d34fae01f /tests
parentc4847f49b30f02c7542eae457055b3de4376e82a (diff)
downloadguix-c74f0cb2b871f59466e6fbfbc954d8fc1cbc3c9c.tar
guix-c74f0cb2b871f59466e6fbfbc954d8fc1cbc3c9c.tar.gz
tests: Prevent 'http_proxy' from breaking Web server tests.
* tests/lint.scm: Add call to 'unsetenv' to remove 'http_proxy'. * tests/publish.scm: Likewise.
Diffstat (limited to 'tests')
-rw-r--r--tests/lint.scm5
-rw-r--r--tests/publish.scm4
2 files changed, 8 insertions, 1 deletions
diff --git a/tests/lint.scm b/tests/lint.scm
index df82593a9e..b8dad13ceb 100644
--- a/tests/lint.scm
+++ b/tests/lint.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
;;;
;;; This file is part of GNU Guix.
@@ -19,6 +19,9 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+;; Avoid interference.
+(unsetenv "http_proxy")
+
(define-module (test-lint)
#:use-module (guix tests)
#:use-module (guix download)
diff --git a/tests/publish.scm b/tests/publish.scm
index 4d72fdc468..0b92390900 100644
--- a/tests/publish.scm
+++ b/tests/publish.scm
@@ -16,6 +16,9 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+;; Avoid interference.
+(unsetenv "http_proxy")
+
(define-module (test-publish)
#:use-module (guix scripts publish)
#:use-module (guix tests)
@@ -62,6 +65,7 @@
(connect conn AF_INET (inet-pton AF_INET "127.0.0.1") 6789))
(loop))))
+
(test-begin "publish")
(test-equal "/nix-cache-info"