summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-01-16 22:49:41 +0100
committerLudovic Courtès <ludo@gnu.org>2020-01-16 23:14:05 +0100
commit9d6c6cb20ef240221fc9a8e155f4bfa53e71bce4 (patch)
tree753d1313bf0776e738a69f798a199b45724b71bd /guix
parentcfd1ed84013df85f0e473884ef4038b4bd7120d4 (diff)
downloadpatches-9d6c6cb20ef240221fc9a8e155f4bfa53e71bce4.tar
patches-9d6c6cb20ef240221fc9a8e155f4bfa53e71bce4.tar.gz
import: elpa: Rewrite test to use an HTTP server instead of mocking.
* guix/import/elpa.scm (elpa-url): Add 'gnu/http'. (elpa->guix-package): Handle it. * tests/elpa.scm (elpa-package-info-mock, auctex-readme-mock) (elpa-version->string, package-source-url, ensure-list) (package-home-page, make-elpa-package): Remove. <top level>: Call '%http-server-port'. (eval-test-with-elpa): Remove uses of 'mock'. Use 'with-http-server' and parameterize 'current-http-proxy' instead.
Diffstat (limited to 'guix')
-rw-r--r--guix/import/elpa.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm
index 83354d3f04..2d4487dba0 100644
--- a/guix/import/elpa.scm
+++ b/guix/import/elpa.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
-;;; Copyright © 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016, 2017, 2018, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;;
;;; This file is part of GNU Guix.
@@ -72,6 +72,7 @@ NAMES (strings)."
"Retrieve the URL of REPO."
(let ((elpa-archives
'((gnu . "https://elpa.gnu.org/packages")
+ (gnu/http . "http://elpa.gnu.org/packages") ;for testing
(melpa-stable . "https://stable.melpa.org/packages")
(melpa . "https://melpa.org/packages"))))
(assq-ref elpa-archives repo)))
@@ -251,7 +252,7 @@ type '<elpa-package>'."
(package
;; ELPA is known to contain only GPLv3+ code. Other repos may contain
;; code under other license but there's no license metadata.
- (let ((license (and (eq? 'gnu repo) 'license:gpl3+)))
+ (let ((license (and (memq repo '(gnu gnu/http)) 'license:gpl3+)))
(elpa-package->sexp package license)))))