diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-01-22 10:46:34 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-01-22 11:15:50 +0100 |
| commit | 33988f9b5876e4b44cabe1997a91eb604931c1ca (patch) | |
| tree | 5980155f32e47ef95ec5268f7c496410a43c50aa /tests | |
| parent | 3b6502e25d421ddc6dec3ed828ef23f311e279a6 (diff) | |
| download | patches-33988f9b5876e4b44cabe1997a91eb604931c1ca.tar patches-33988f9b5876e4b44cabe1997a91eb604931c1ca.tar.gz | |
publish: Restore gzip compression in cache-less mode.
Fixes <https://bugs.gnu.org/30184>.
Regression introduced in 297e04d66010ada31a40f40143d81bf6b62affcc.
Reported by Christopher Baines <mail@cbaines.net>.
* guix/scripts/publish.scm (nar-response-port): Add 'compression'
parameter and honor it.
(http-write): Get 'x-nar-compression' from the initial RESPONSE.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/publish.scm | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/tests/publish.scm b/tests/publish.scm index bd1a75cf00..8c88a8c93d 100644 --- a/tests/publish.scm +++ b/tests/publish.scm @@ -111,6 +111,10 @@ (sleep 1) (loop (- i 1)))))) +(define %gzip-magic-bytes + ;; Magic bytes of gzip file. + #vu8(#x1f #x8b)) + ;; Wait until the two servers are ready. (wait-until-ready 6789) @@ -215,6 +219,18 @@ FileSize: ~a~%" (unless (zlib-available?) (test-skip 1)) +(test-equal "/nar/gzip/* is really gzip" + %gzip-magic-bytes + ;; Since 'gzdopen' (aka. 'call-with-gzip-input-port') transparently reads + ;; uncompressed gzip, the test above doesn't check whether it's actually + ;; gzip. This is what this test does. See <https://bugs.gnu.org/30184>. + (let ((nar (http-get-port + (publish-uri + (string-append "/nar/gzip/" (basename %item)))))) + (get-bytevector-n nar (bytevector-length %gzip-magic-bytes)))) + +(unless (zlib-available?) + (test-skip 1)) (test-equal "/*.narinfo with compression" `(("StorePath" . ,%item) ("URL" . ,(string-append "nar/gzip/" (basename %item))) |