diff options
| author | Reepca Russelstein <reepca@russelstein.xyz> | 2025-09-16 22:08:19 -0500 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-10-12 22:22:01 +0200 |
| commit | 55a10ce4e618d334ccc5df71bf94483d7c9966ed (patch) | |
| tree | ce57a8ee7ad45b670dc250b0857c8c85da845213 /tests/builders.scm | |
| parent | b39f914b3ef779ab50b2af5e4eee0d0f93e9b7f4 (diff) | |
tests: don't use 'file://...' URIs for testing git downloads.
While 'url-fetch*' in (guix download) special-cases these URIs, 'git-fetch'
does not. Consequently, the recent changes to (guix scripts perform-download)
that disallow these URIs cause tests that use builtin:git-download to fail.
* guix/tests/git.scm (serve-git-repository, call-with-served-git-repository):
new procedures.
(with-served-git-repository, with-served-temporary-git-repository): new
syntax.
* .dir-locals.el (scheme-mode): add indentation information for
'with-served-git-repository'.
* tests/builders.scm ("git-fetch, file URI"): use git:// URI with
'with-served-temporary-git-repository'.
* tests/derivations.scm ("'git-download' build-in builder, invalid hash",
"'git-download' built-in builder, invalid commit", "'git-download' built-in
builder, not found"): same.
("'git-download' built-in builder"): same, and use a nonce in the repo
contents so that success isn't cached.
Change-Id: Id3e1233bb74d5987faf89c4341e1d37f09c77c80
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'tests/builders.scm')
| -rw-r--r-- | tests/builders.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/builders.scm b/tests/builders.scm index 0ed295a93f4..44add1d13ea 100644 --- a/tests/builders.scm +++ b/tests/builders.scm @@ -88,10 +88,10 @@ (and (file-exists? out) (valid-path? %store out)))) -(test-equal "git-fetch, file URI" +(test-equal "git-fetch, local URI" '("." ".." "a.txt" "b.scm") (let ((nonce (random-text))) - (with-temporary-git-repository directory + (with-served-temporary-git-repository directory port `((add "a.txt" ,nonce) (add "b.scm" "#t") (commit "Commit.") @@ -103,7 +103,9 @@ #:recursive? #t)) (drv (git-fetch (git-reference - (url (string-append "file://" directory)) + (url (string-append "git://localhost:" + (number->string port) + "/")) (commit "v1.0.0")) 'sha256 hash "git-fetch-test"))) |