mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 07:26:13 -05:00
import: texlive: Avoid uses of '@@' in tests.
* guix/import/texlive.scm (fetch-sxml, sxml->package): Export. * tests/texlive.scm <top level>: Call '%http-server-port'. ("fetch-sxml: returns SXML for valid XML"): Use 'with-http-server' and set 'current-http-proxy' instead of using 'mock'. ("sxml->package"): Remove use of '@@'.
This commit is contained in:
parent
282f91790a
commit
6f918d69b4
2 changed files with 13 additions and 6 deletions
|
@ -38,7 +38,10 @@ (define-module (guix import texlive)
|
|||
#:use-module (guix packages)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (guix build-system texlive)
|
||||
#:export (texlive->guix-package))
|
||||
#:export (texlive->guix-package
|
||||
|
||||
fetch-sxml
|
||||
sxml->package))
|
||||
|
||||
;;; Commentary:
|
||||
;;;
|
||||
|
|
|
@ -20,10 +20,12 @@ (define-module (test-texlive)
|
|||
#:use-module (gnu packages tex)
|
||||
#:use-module (guix import texlive)
|
||||
#:use-module (guix tests)
|
||||
#:use-module (guix tests http)
|
||||
#:use-module (guix build utils)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-64)
|
||||
#:use-module (srfi srfi-26)
|
||||
#:use-module (web client)
|
||||
#:use-module (ice-9 match))
|
||||
|
||||
(test-begin "texlive")
|
||||
|
@ -67,12 +69,14 @@ (define sxml
|
|||
(keyval (@ (value "tests") (key "topic")))
|
||||
"\n null\n")))
|
||||
|
||||
;; Avoid collisions with other tests.
|
||||
(%http-server-port 10200)
|
||||
|
||||
(test-equal "fetch-sxml: returns SXML for valid XML"
|
||||
sxml
|
||||
(mock ((guix http-client) http-fetch
|
||||
(lambda (url)
|
||||
xml))
|
||||
((@@ (guix import texlive) fetch-sxml) "foo")))
|
||||
(with-http-server `((200 ,xml))
|
||||
(parameterize ((current-http-proxy (%local-url)))
|
||||
(fetch-sxml "foo"))))
|
||||
|
||||
;; TODO:
|
||||
(test-assert "sxml->package"
|
||||
|
@ -86,7 +90,7 @@ (define sxml
|
|||
(with-output-to-file (string-append directory "/foo")
|
||||
(lambda ()
|
||||
(display "source")))))
|
||||
(let ((result ((@@ (guix import texlive) sxml->package) sxml)))
|
||||
(let ((result (sxml->package sxml)))
|
||||
(match result
|
||||
(('package
|
||||
('name "texlive-latex-foo")
|
||||
|
|
Loading…
Reference in a new issue