aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-05-18 21:19:49 +0200
committerLudovic Courtès <ludo@gnu.org>2017-05-20 10:17:36 +0200
commit4a628d57fc7956ae8a0fb167337d83ba66fe4f52 (patch)
treea0e9bf6ec2c05de11ea15bfd924ebfd1de05e136
parent36c99429a3638305c16f1e6f5e087daa174d249c (diff)
downloadpatches-4a628d57fc7956ae8a0fb167337d83ba66fe4f52.tar
patches-4a628d57fc7956ae8a0fb167337d83ba66fe4f52.tar.gz
publish: Fix narinfo rendering for already-compressed items.
Fixes <http://bugs.gnu.org/26975>. Reported by Mark H Weaver <mhw@netris.org>. * guix/scripts/publish.scm (bake-narinfo+nar): Pass #f as the 2nd argument to 'stat' and properly handle #f. * tests/publish.scm (wait-for-file): New procedure. ("with cache"): Remove 'wait-for-file' procedure. ("with cache, uncompressed"): New test.
-rw-r--r--guix/scripts/publish.scm3
-rw-r--r--tests/publish.scm71
2 files changed, 65 insertions, 9 deletions
diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm
index 8da75cb825..db7f6a957e 100644
--- a/guix/scripts/publish.scm
+++ b/guix/scripts/publish.scm
@@ -481,7 +481,8 @@ requested using POOL."
(%private-key)
#:nar-path nar-path
#:compression compression
- #:file-size (stat:size (stat nar)))
+ #:file-size (and=> (stat nar #f)
+ stat:size))
port))))))
;; XXX: Declare the 'Guix-Compression' HTTP header, which is in fact for
diff --git a/tests/publish.scm b/tests/publish.scm
index 268c324551..31043f71fa 100644
--- a/tests/publish.scm
+++ b/tests/publish.scm
@@ -98,6 +98,18 @@
(connect conn AF_INET (inet-pton AF_INET "127.0.0.1") port))
(loop)))))
+(define (wait-for-file file)
+ ;; Wait until FILE shows up.
+ (let loop ((i 20))
+ (cond ((file-exists? file)
+ #t)
+ ((zero? i)
+ (error "file didn't show up" file))
+ (else
+ (pk 'wait-for-file file)
+ (sleep 1)
+ (loop (- i 1))))))
+
;; Wait until the two servers are ready.
(wait-until-ready 6789)
@@ -331,14 +343,6 @@ FileSize: ~a~%"
200) ;nar/…
(call-with-temporary-directory
(lambda (cache)
- (define (wait-for-file file)
- (let loop ((i 20))
- (or (file-exists? file)
- (begin
- (pk 'wait-for-file file)
- (sleep 1)
- (loop (- i 1))))))
-
(let ((thread (with-separate-output-ports
(call-with-new-thread
(lambda ()
@@ -384,4 +388,55 @@ FileSize: ~a~%"
(stat:size (stat nar)))
(response-code uncompressed)))))))))
+(unless (zlib-available?)
+ (test-skip 1))
+(let ((item (add-text-to-store %store "fake-compressed-thing.tar.gz"
+ (random-text))))
+ (test-equal "with cache, uncompressed"
+ (list #f
+ `(("StorePath" . ,item)
+ ("URL" . ,(string-append "nar/" (basename item)))
+ ("Compression" . "none"))
+ 200 ;nar/…
+ (path-info-nar-size
+ (query-path-info %store item)) ;FileSize
+ 404) ;nar/gzip/…
+ (call-with-temporary-directory
+ (lambda (cache)
+ (let ((thread (with-separate-output-ports
+ (call-with-new-thread
+ (lambda ()
+ (guix-publish "--port=6796" "-C2"
+ (string-append "--cache=" cache)))))))
+ (wait-until-ready 6796)
+ (let* ((base "http://localhost:6796/")
+ (part (store-path-hash-part item))
+ (url (string-append base part ".narinfo"))
+ (cached (string-append cache "/none/"
+ (basename item) ".narinfo"))
+ (nar (string-append cache "/none/"
+ (basename item) ".nar"))
+ (response (http-get url)))
+ (and (= 404 (response-code response))
+
+ (wait-for-file cached)
+ (let* ((body (http-get-port url))
+ (compressed (http-get (string-append base "nar/gzip/"
+ (basename item))))
+ (uncompressed (http-get (string-append base "nar/"
+ (basename item))))
+ (narinfo (recutils->alist body)))
+ (list (file-exists? nar)
+ (filter (lambda (item)
+ (match item
+ (("Compression" . _) #t)
+ (("StorePath" . _) #t)
+ (("URL" . _) #t)
+ (_ #f)))
+ narinfo)
+ (response-code uncompressed)
+ (string->number
+ (assoc-ref narinfo "FileSize"))
+ (response-code compressed))))))))))
+
(test-end "publish")