tests: Prevent 'http_proxy' from breaking Web server tests.

* tests/lint.scm: Add call to 'unsetenv' to remove 'http_proxy'.
* tests/publish.scm: Likewise.
This commit is contained in:
Ludovic Courtès 2016-01-21 23:45:52 +01:00
parent c4847f49b3
commit c74f0cb2b8
2 changed files with 8 additions and 1 deletions

View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2012, 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org> ;;; 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> ;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -19,6 +19,9 @@
;;; You should have received a copy of the GNU General Public License ;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
;; Avoid interference.
(unsetenv "http_proxy")
(define-module (test-lint) (define-module (test-lint)
#:use-module (guix tests) #:use-module (guix tests)
#:use-module (guix download) #:use-module (guix download)

View file

@ -16,6 +16,9 @@
;;; You should have received a copy of the GNU General Public License ;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
;; Avoid interference.
(unsetenv "http_proxy")
(define-module (test-publish) (define-module (test-publish)
#:use-module (guix scripts publish) #:use-module (guix scripts publish)
#:use-module (guix tests) #:use-module (guix tests)
@ -62,6 +65,7 @@ (define (publish-uri route)
(connect conn AF_INET (inet-pton AF_INET "127.0.0.1") 6789)) (connect conn AF_INET (inet-pton AF_INET "127.0.0.1") 6789))
(loop)))) (loop))))
(test-begin "publish") (test-begin "publish")
(test-equal "/nix-cache-info" (test-equal "/nix-cache-info"