me
/
guix
Archived
1
0
Fork 0
Code

tests: ‘rewrite-url’ test no longer depends on network access. 

Fixes <https://issues.guix.gnu.org/66097>.
Previously, this test would actually need to access dist.libuv.org.

* tests/gnu-maintenance.scm ("rewrite-url, without to-version"): Change
URLs from https to http, and from libuv.org to libuv.example.org.
Parameterize ‘current-http-proxy’.

Reported-by: Janneke Nieuwenhuizen <janneke@gnu.org>
Ludovic Courtès 2023-09-27 23:34:15 +02:00
parent bab1d1704d
commit 72fc91b113
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/gnu-maintenance.scm
View File

@ -25,6 +25,7 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-64) #:use-module (srfi srfi-64)
#:use-module ((web client) #:select (current-http-proxy))
#:use-module (ice-9 match)) #:use-module (ice-9 match))
(test-begin "gnu-maintenance") (test-begin "gnu-maintenance")
@ -157,9 +158,9 @@ submodules/qtbase-everywhere-src-6.5.2.tar.xz"
submodules/qtbase-everywhere-src-6.3.2.tar.xz" "6.3.2" #:to-version "6.5.2")) submodules/qtbase-everywhere-src-6.3.2.tar.xz" "6.3.2" #:to-version "6.5.2"))
(test-equal "rewrite-url, without to-version" (test-equal "rewrite-url, without to-version"
"https://dist.libuv.org/dist/v1.46.0/libuv-v1.46.0.tar.gz" "http://dist.libuv.example.org/dist/v1.46.0/libuv-v1.46.0.tar.gz"
(with-http-server (with-http-server
;; First reply, crawling https://dist.libuv.org/dist/. ;; First reply, crawling http://dist.libuv.example.org/dist/.
`((200 "\ `((200 "\
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
@ -173,7 +174,7 @@ submodules/qtbase-everywhere-src-6.3.2.tar.xz" "6.3.2" #:to-version "6.5.2"))
<a href=\"v1.46.0/\" title=\"v1.46.0/\">v1.46.0/</a> <a href=\"v1.46.0/\" title=\"v1.46.0/\">v1.46.0/</a>
</body> </body>
</html>") </html>")
;; Second reply, crawling https://dist.libuv.org/dist/v1.46.0/. ;; Second reply, crawling http://dist.libuv.example.org/dist/v1.46.0/.
(200 "\ (200 "\
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
@ -190,7 +191,8 @@ submodules/qtbase-everywhere-src-6.3.2.tar.xz" "6.3.2" #:to-version "6.5.2"))
libuv-v1.46.0.tar.gz.sign</a> libuv-v1.46.0.tar.gz.sign</a>
</body> </body>
</html>")) </html>"))
(rewrite-url "https://dist.libuv.org/dist/v1.45.0/libuv-v1.45.0.tar.gz" (parameterize ((current-http-proxy (%local-url)))
"1.45.0"))) (rewrite-url "http://dist.libuv.example.org/dist/v1.45.0/libuv-v1.45.0.tar.gz"
"1.45.0"))))
(test-end) (test-end)