diff options
author | Ludovic Courtès <ludo@gnu.org> | 2020-11-04 15:57:00 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2020-11-04 16:02:53 +0100 |
commit | 5e7cf66fb35780f930ad0bc5fe21ac330df4411d (patch) | |
tree | b4604b178b43e29e136635333a7716579f02dbab /tests/publish.scm | |
parent | 95024494f31c3176bcd2238662e7b7868acc2882 (diff) |
publish: Do not path the empty string to 'query-path-info'.
Fixes <https://bugs.gnu.org/44442>.
Regression introduced in 2b2ab7796ac186d88060793b8873fc0e21462758.
* guix/scripts/publish.scm (render-nar/cached): Do not call
'bypass-cache?' when ITEM is the empty string.
* tests/publish.scm ("with cache, cache bypass, unmapped hash part"):
New test.
Diffstat (limited to 'tests/publish.scm')
-rw-r--r-- | tests/publish.scm | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/tests/publish.scm b/tests/publish.scm index 84aa6e5d73..e46e6256b7 100644 --- a/tests/publish.scm +++ b/tests/publish.scm @@ -622,6 +622,41 @@ References: ~%" (stat:size (stat item))) (response-code response)))))))))) +(test-equal "with cache, cache bypass, unmapped hash part" + 200 + + ;; This test reproduces the bug described in <https://bugs.gnu.org/44442>: + ;; the daemon connection would be closed as a side effect of a nar request + ;; for a non-existing file name. + (call-with-temporary-directory + (lambda (cache) + (let ((thread (with-separate-output-ports + (call-with-new-thread + (lambda () + (guix-publish "--port=6787" "-C" "gzip" + (string-append "--cache=" cache))))))) + (wait-until-ready 6787) + + (let* ((base "http://localhost:6787/") + (item (add-text-to-store %store "random" (random-text))) + (part (store-path-hash-part item)) + (narinfo (string-append base part ".narinfo")) + (nar (string-append base "nar/gzip/" (basename item))) + (cached (string-append cache "/gzip/" (basename item) + ".narinfo"))) + ;; The first response used to be 500 and to terminate the daemon + ;; connection as a side effect. + (and (= (response-code + (http-get (string-append base "nar/gzip/" + (make-string 32 #\e) + "-does-not-exist"))) + 404) + (= 200 (response-code (http-get nar))) + (= 200 (response-code (http-get narinfo))) + (begin + (wait-for-file cached) + (response-code (http-get nar))))))))) + (test-equal "/log/NAME" `(200 #t application/x-bzip2) (let ((drv (run-with-store %store |