diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-12-08 22:58:37 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-12-08 22:58:37 +0100 |
| commit | 799f066768bacb321ebad84c75b2bbfd269e7cd8 (patch) | |
| tree | c6b100b2f44a4e613e9aeee7d54bb57ca466bdb7 | |
| parent | bfe4cdf88ee3e88910d22291a4c745462f2d6417 (diff) | |
| download | guix-799f066768bacb321ebad84c75b2bbfd269e7cd8.tar guix-799f066768bacb321ebad84c75b2bbfd269e7cd8.tar.gz | |
import: opam: Adjust test to latest 'opam->guix-package' changes.
This is a followup to a8dccd4bdc1e58219d4ba08fe1649bf0b8325f44, which
broke the test.
* guix/import/opam.scm (get-opam-repository): Prevent inlining.
* tests/opam.scm ("opam->guix-package"): Mock 'get-opam-repository'.
| -rw-r--r-- | guix/import/opam.scm | 3 | ||||
| -rw-r--r-- | tests/opam.scm | 67 |
2 files changed, 38 insertions, 32 deletions
diff --git a/guix/import/opam.scm b/guix/import/opam.scm index 54143f83ca..670973b193 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -141,6 +141,9 @@ path to the repository." (string-append location "/" (substring (symbol->string repo) 4))) (else location))))) +;; Prevent Guile 3 from inlining this procedure so we can mock it in tests. +(set! get-opam-repository get-opam-repository) + (define (latest-version versions) "Find the most recent version from a list of versions." (fold (lambda (a b) (if (version>? a b) a b)) (car versions) versions)) diff --git a/tests/opam.scm b/tests/opam.scm index 8d43e2ce70..11984b56a6 100644 --- a/tests/opam.scm +++ b/tests/opam.scm @@ -80,38 +80,41 @@ url { (set! test-source-hash (call-with-input-file file-name port-sha256)))) (_ (error "Unexpected URL: " url))))) - (let ((my-package (string-append test-repo "/packages/foo/foo.1.0.0"))) - (mkdir-p my-package) - (with-output-to-file (string-append my-package "/opam") - (lambda _ - (format #t "~a" test-opam-file)))) - (match (opam->guix-package "foo" #:repo test-repo) - (('package - ('name "ocaml-foo") - ('version "1.0.0") - ('source ('origin - ('method 'url-fetch) - ('uri "https://example.org/foo-1.0.0.tar.gz") - ('sha256 - ('base32 - (? string? hash))))) - ('build-system 'ocaml-build-system) - ('propagated-inputs - ('quasiquote - (("ocaml-zarith" ('unquote 'ocaml-zarith))))) - ('native-inputs - ('quasiquote - (("ocaml-alcotest" ('unquote 'ocaml-alcotest)) - ("ocamlbuild" ('unquote 'ocamlbuild))))) - ('home-page "https://example.org/") - ('synopsis "Some example package") - ('description "This package is just an example.") - ('license #f)) - (string=? (bytevector->nix-base32-string - test-source-hash) - hash)) - (x - (pk 'fail x #f))))) + (mock ((guix import opam) get-opam-repository + (const test-repo)) + (let ((my-package (string-append test-repo + "/packages/foo/foo.1.0.0"))) + (mkdir-p my-package) + (with-output-to-file (string-append my-package "/opam") + (lambda _ + (format #t "~a" test-opam-file)))) + (match (opam->guix-package "foo" #:repo test-repo) + (('package + ('name "ocaml-foo") + ('version "1.0.0") + ('source ('origin + ('method 'url-fetch) + ('uri "https://example.org/foo-1.0.0.tar.gz") + ('sha256 + ('base32 + (? string? hash))))) + ('build-system 'ocaml-build-system) + ('propagated-inputs + ('quasiquote + (("ocaml-zarith" ('unquote 'ocaml-zarith))))) + ('native-inputs + ('quasiquote + (("ocaml-alcotest" ('unquote 'ocaml-alcotest)) + ("ocamlbuild" ('unquote 'ocamlbuild))))) + ('home-page "https://example.org/") + ('synopsis "Some example package") + ('description "This package is just an example.") + ('license #f)) + (string=? (bytevector->nix-base32-string + test-source-hash) + hash)) + (x + (pk 'fail x #f)))))) ;; Test the opam file parser ;; We fold over some test cases. Each case is a pair of the string to parse and the |