diff options
author | Ludovic Courtès <ludo@gnu.org> | 2020-04-27 22:12:59 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2020-04-27 23:29:40 +0200 |
commit | 5dfe02c60767a633c67f7f6fc9557b54b3c99b63 (patch) | |
tree | 666cf4946bbb0f02efa2690fd3147daad003d4ff | |
parent | 78799a6fdc5a00b3a0e62c0e99c3340298d36eff (diff) | |
download | patches-5dfe02c60767a633c67f7f6fc9557b54b3c99b63.tar patches-5dfe02c60767a633c67f7f6fc9557b54b3c99b63.tar.gz |
tests: Remove trailing commas in JSON tests.
These commas are rejected by Guile-JSON 3.5.0.
* tests/crate.scm (test-foo-dependencies)
(test-root-dependencies, test-intermediate-1-dependencies)
(test-intermediate-2-dependencies): Remove trailing commas.
* tests/gem.scm (test-bar-json): Likewise.
* tests/pypi.scm (test-json): Likewise.
-rw-r--r-- | tests/crate.scm | 23 | ||||
-rw-r--r-- | tests/gem.scm | 2 | ||||
-rw-r--r-- | tests/pypi.scm | 7 |
3 files changed, 17 insertions, 15 deletions
diff --git a/tests/crate.scm b/tests/crate.scm index aa51faebf9..61a04f986b 100644 --- a/tests/crate.scm +++ b/tests/crate.scm @@ -55,7 +55,7 @@ \"dependencies\": [ { \"crate_id\": \"bar\", - \"kind\": \"normal\", + \"kind\": \"normal\" } ] }") @@ -87,20 +87,20 @@ \"dependencies\": [ { \"crate_id\": \"intermediate-1\", - \"kind\": \"normal\", + \"kind\": \"normal\" }, { \"crate_id\": \"intermediate-2\", - \"kind\": \"normal\", + \"kind\": \"normal\" } { \"crate_id\": \"leaf-alice\", - \"kind\": \"normal\", + \"kind\": \"normal\" }, { \"crate_id\": \"leaf-bob\", - \"kind\": \"normal\", - }, + \"kind\": \"normal\" + } ] }") @@ -131,15 +131,15 @@ \"dependencies\": [ { \"crate_id\": \"intermediate-2\", - \"kind\": \"normal\", + \"kind\": \"normal\" }, { \"crate_id\": \"leaf-alice\", - \"kind\": \"normal\", + \"kind\": \"normal\" }, { \"crate_id\": \"leaf-bob\", - \"kind\": \"normal\", + \"kind\": \"normal\" } ] }") @@ -171,8 +171,8 @@ \"dependencies\": [ { \"crate_id\": \"leaf-bob\", - \"kind\": \"normal\", - }, + \"kind\": \"normal\" + } ] }") @@ -233,6 +233,7 @@ (define test-source-hash "") + (test-begin "crate") (test-equal "guix-package->crate-name" diff --git a/tests/gem.scm b/tests/gem.scm index 455fc15189..751bba656f 100644 --- a/tests/gem.scm +++ b/tests/gem.scm @@ -52,7 +52,7 @@ \"homepage_uri\": \"https://example.com\", \"dependencies\": { \"runtime\": [ - { \"name\": \"bundler\" }, + { \"name\": \"bundler\" } ] }, \"licenses\": null diff --git a/tests/pypi.scm b/tests/pypi.scm index 19af6e61fb..6788c8db3e 100644 --- a/tests/pypi.scm +++ b/tests/pypi.scm @@ -46,13 +46,13 @@ \"1.0.0\": [ { \"url\": \"https://example.com/foo-1.0.0.egg\", - \"packagetype\": \"bdist_egg\", + \"packagetype\": \"bdist_egg\" }, { \"url\": \"https://example.com/foo-1.0.0.tar.gz\", - \"packagetype\": \"sdist\", + \"packagetype\": \"sdist\" }, { \"url\": \"https://example.com/foo-1.0.0-py2.py3-none-any.whl\", - \"packagetype\": \"bdist_wheel\", + \"packagetype\": \"bdist_wheel\" } ] } @@ -120,6 +120,7 @@ Provides-Extra: testing Requires-Dist: pytest (>=3.1.0); extra == 'testing' ") + (test-begin "pypi") (test-equal "guix-package->pypi-name, old URL style" |