summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-11-18 22:56:10 +0100
committerLudovic Courtès <ludo@gnu.org>2021-11-18 22:56:10 +0100
commitbcff9d6388dc1cad38fbfb3983f97f52d0533301 (patch)
tree19610200dbbffa9ab243ec6afedb3d923f513c6b
parent7d043abfdb4b915f57cf14c5d6f7dcbceb63ea25 (diff)
downloadguix-bcff9d6388dc1cad38fbfb3983f97f52d0533301.tar.gz
tests: Adjust opam and pypi tests to simplified inputs.
* tests/opam.scm ("opam->guix-package"): Expect simplified inputs.
* tests/pypi.scm ("pypi->guix-package, package name contains \"-\" followed by digits"):
Likewise.
-rw-r--r--tests/opam.scm8
-rw-r--r--tests/pypi.scm9
2 files changed, 4 insertions, 13 deletions
diff --git a/tests/opam.scm b/tests/opam.scm
index cf65ded168..b5f02f809b 100644
--- a/tests/opam.scm
+++ b/tests/opam.scm
@@ -102,13 +102,9 @@ url {
                                ('base32
                                 (? string? hash)))))
                    ('build-system 'ocaml-build-system)
-                   ('propagated-inputs
-                    ('quasiquote
-                     (("ocaml-zarith" ('unquote 'ocaml-zarith)))))
+                   ('propagated-inputs ('list 'ocaml-zarith))
                    ('native-inputs
-                    ('quasiquote
-                     (("ocaml-alcotest" ('unquote 'ocaml-alcotest))
-                      ("ocamlbuild" ('unquote 'ocamlbuild)))))
+                    ('list 'ocaml-alcotest 'ocamlbuild))
                    ('home-page "https://example.org/")
                    ('synopsis "Some example package")
                    ('description "This package is just an example.")
diff --git a/tests/pypi.scm b/tests/pypi.scm
index debe4ce82d..1ea5f02643 100644
--- a/tests/pypi.scm
+++ b/tests/pypi.scm
@@ -416,13 +416,8 @@ Requires-Dist: pytest (>=3.1.0); extra == 'testing'
                                 (? string? hash)))))
                    ('properties ('quote (("upstream-name" . "foo-99"))))
                    ('build-system 'python-build-system)
-                   ('propagated-inputs
-                    ('quasiquote
-                     (("python-bar" ('unquote 'python-bar))
-                      ("python-foo" ('unquote 'python-foo)))))
-                   ('native-inputs
-                    ('quasiquote
-                     (("python-pytest" ('unquote 'python-pytest)))))
+                   ('propagated-inputs ('list 'python-bar 'python-foo))
+                   ('native-inputs ('list 'python-pytest))
                    ('home-page "http://example.com")
                    ('synopsis "summary")
                    ('description "summary")