diff options
| author | Mark H Weaver <mhw@netris.org> | 2019-09-06 20:46:00 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2019-09-06 20:46:00 -0400 |
| commit | 65542a8852759f35e19959149ac92297c8b54be5 (patch) | |
| tree | bc8f398c7b10a4725b20aa59ab1452d30f358ea3 /tests/derivations.scm | |
| parent | bc60349b5bc58a0b803df5adce1de6db82453744 (diff) | |
| parent | f66aee3d0d2f573187ed5d44ae7c13d73cd4097a (diff) | |
| download | guix-65542a8852759f35e19959149ac92297c8b54be5.tar guix-65542a8852759f35e19959149ac92297c8b54be5.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'tests/derivations.scm')
| -rw-r--r-- | tests/derivations.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/derivations.scm b/tests/derivations.scm index 56b2775248..6a7fad85b5 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -209,7 +209,7 @@ (test-skip 1)) (test-assert "'download' built-in builder" (let ((text (random-text))) - (with-http-server 200 text + (with-http-server `((200 ,text)) (let* ((drv (derivation %store "world" "builtin:download" '() #:env-vars `(("url" @@ -224,7 +224,7 @@ (unless (http-server-can-listen?) (test-skip 1)) (test-assert "'download' built-in builder, invalid hash" - (with-http-server 200 "hello, world!" + (with-http-server `((200 "hello, world!")) (let* ((drv (derivation %store "world" "builtin:download" '() #:env-vars `(("url" @@ -239,7 +239,7 @@ (unless (http-server-can-listen?) (test-skip 1)) (test-assert "'download' built-in builder, not found" - (with-http-server 404 "not found" + (with-http-server '((404 "not found")) (let* ((drv (derivation %store "will-never-be-found" "builtin:download" '() #:env-vars `(("url" @@ -274,9 +274,9 @@ . ,(object->string (%local-url)))) #:hash-algo 'sha256 #:hash (sha256 (string->utf8 text))))) - (and (with-http-server 200 text + (and (with-http-server `((200 ,text)) (build-derivations %store (list drv))) - (with-http-server 200 text + (with-http-server `((200 ,text)) (build-derivations %store (list drv) (build-mode check))) (string=? (call-with-input-file (derivation->output-path drv) @@ -1263,5 +1263,5 @@ (test-end) ;; Local Variables: -;; eval: (put 'with-http-server 'scheme-indent-function 2) +;; eval: (put 'with-http-server 'scheme-indent-function 1) ;; End: |