From bcff9d6388dc1cad38fbfb3983f97f52d0533301 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 18 Nov 2021 22:56:10 +0100 Subject: 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. --- tests/opam.scm | 8 ++------ tests/pypi.scm | 9 ++------- 2 files changed, 4 insertions(+), 13 deletions(-) (limited to 'tests') 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 @@ (define test-repo ('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 @@ (define test-metadata-with-extras-jedi "\ (? 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") -- cgit v1.2.3