diff options
| author | Marius Bakke <marius@gnu.org> | 2023-01-03 15:38:13 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2023-01-03 15:38:13 +0100 |
| commit | 9123bb0fba3fce976dc41cd3b8919ee73b4cee4d (patch) | |
| tree | 50ba63a4a3a6ffeb2f37fd0929813b51e00d01dc /tests | |
| parent | ec0fbb471dfc6f72796da9ebafbb0630daa91267 (diff) | |
| parent | 71ee1fbbed8ea9788dd48a634653d66606d372ce (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gnu-maintenance.scm | 6 | ||||
| -rw-r--r-- | tests/import-utils.scm | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/gnu-maintenance.scm b/tests/gnu-maintenance.scm index fcaa2a068e..516e02ec6a 100644 --- a/tests/gnu-maintenance.scm +++ b/tests/gnu-maintenance.scm @@ -79,7 +79,7 @@ (uri (string-append (%local-url) "/foo-1.tar.gz")))) (properties `((release-monitoring-url . ,(%local-url)))))) - (define update ((upstream-updater-latest %generic-html-updater) package)) + (define update ((upstream-updater-import %generic-html-updater) package)) (define expected-new-url "http://another-site/foo-2.tar.gz") (and (pk 'u update) (equal? (upstream-source-version update) "2") @@ -104,7 +104,7 @@ (uri (string-append (%local-url) "/foo-1.tar.gz")))) (properties `((release-monitoring-url . ,(%local-url)))))) - (define update ((upstream-updater-latest %generic-html-updater) package)) + (define update ((upstream-updater-import %generic-html-updater) package)) (define expected-new-url (string-append (%local-url) "/foo-2.tar.gz")) (and (pk 'u update) @@ -135,7 +135,7 @@ (uri (string-append (%local-url) "/foo-1.tar.gz")))) (properties `((release-monitoring-url . ,(%local-url)))))) - (define update ((upstream-updater-latest %generic-html-updater) package)) + (define update ((upstream-updater-import %generic-html-updater) package)) (define expected-new-url (string-append (%local-url) "/foo-2.tar.gz")) (define expected-signature-url diff --git a/tests/import-utils.scm b/tests/import-utils.scm index f50f730873..44dff14597 100644 --- a/tests/import-utils.scm +++ b/tests/import-utils.scm @@ -67,12 +67,12 @@ Differences are hard to spot, e.g. in CLOS vs. GOOPS.")) #:repo 'repo #:repo->guix-package (match-lambda* - (("foo" #:version #f #:repo 'repo) + (("foo" #:repo 'repo . rest) (values '(package (name "foo") (inputs `(("bar" ,bar)))) '("bar"))) - (("bar" #:version #f #:repo 'repo) + (("bar" #:repo 'repo . rest) (values '(package (name "bar")) '()))) @@ -84,7 +84,7 @@ Differences are hard to spot, e.g. in CLOS vs. GOOPS.")) #:repo 'repo #:repo->guix-package (match-lambda* - (("foo" #:version #f #:repo 'repo) + (("foo" #:repo 'repo . rest) (values #f '()))) #:guix-name identity)) @@ -96,12 +96,12 @@ Differences are hard to spot, e.g. in CLOS vs. GOOPS.")) #:repo 'repo #:repo->guix-package (match-lambda* - (("foo" #:version #f #:repo 'repo) + (("foo" #:repo 'repo . rest) (values '(package (name "foo") (inputs `(("bar" ,bar)))) '("bar"))) - (("bar" #:version #f #:repo 'repo) + (("bar" #:repo 'repo . rest) (values #f '()))) #:guix-name identity)) |