rekahsoft
/
guix
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2020-04-27 22:12:59 +02:00
parent 78799a6fdc
commit 5dfe02c607
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/crate.scm
View File

@ -55,7 +55,7 @@
\"dependencies\": [ \"dependencies\": [
{ {
\"crate_id\": \"bar\", \"crate_id\": \"bar\",
\"kind\": \"normal\", \"kind\": \"normal\"
} }
] ]
}") }")
@ -87,20 +87,20 @@
\"dependencies\": [ \"dependencies\": [
{ {
\"crate_id\": \"intermediate-1\", \"crate_id\": \"intermediate-1\",
\"kind\": \"normal\", \"kind\": \"normal\"
}, },
{ {
\"crate_id\": \"intermediate-2\", \"crate_id\": \"intermediate-2\",
\"kind\": \"normal\", \"kind\": \"normal\"
} }
{ {
\"crate_id\": \"leaf-alice\", \"crate_id\": \"leaf-alice\",
\"kind\": \"normal\", \"kind\": \"normal\"
}, },
{ {
\"crate_id\": \"leaf-bob\", \"crate_id\": \"leaf-bob\",
\"kind\": \"normal\", \"kind\": \"normal\"
}, }
] ]
}") }")
@ -131,15 +131,15 @@
\"dependencies\": [ \"dependencies\": [
{ {
\"crate_id\": \"intermediate-2\", \"crate_id\": \"intermediate-2\",
\"kind\": \"normal\", \"kind\": \"normal\"
}, },
{ {
\"crate_id\": \"leaf-alice\", \"crate_id\": \"leaf-alice\",
\"kind\": \"normal\", \"kind\": \"normal\"
}, },
{ {
\"crate_id\": \"leaf-bob\", \"crate_id\": \"leaf-bob\",
\"kind\": \"normal\", \"kind\": \"normal\"
} }
] ]
}") }")
@ -171,8 +171,8 @@
\"dependencies\": [ \"dependencies\": [
{ {
\"crate_id\": \"leaf-bob\", \"crate_id\": \"leaf-bob\",
\"kind\": \"normal\", \"kind\": \"normal\"
}, }
] ]
}") }")
@ -233,6 +233,7 @@
(define test-source-hash (define test-source-hash
"") "")
(test-begin "crate") (test-begin "crate")
(test-equal "guix-package->crate-name" (test-equal "guix-package->crate-name"

2
tests/gem.scm
View File

@ -52,7 +52,7 @@
\"homepage_uri\": \"https://example.com\", \"homepage_uri\": \"https://example.com\",
\"dependencies\": { \"dependencies\": {
\"runtime\": [ \"runtime\": [
{ \"name\": \"bundler\" }, { \"name\": \"bundler\" }
] ]
}, },
\"licenses\": null \"licenses\": null

7
tests/pypi.scm
View File

@ -46,13 +46,13 @@
\"1.0.0\": [ \"1.0.0\": [
{ {
\"url\": \"https://example.com/foo-1.0.0.egg\", \"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\", \"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\", \"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' Requires-Dist: pytest (>=3.1.0); extra == 'testing'
") ")
(test-begin "pypi") (test-begin "pypi")
(test-equal "guix-package->pypi-name, old URL style" (test-equal "guix-package->pypi-name, old URL style"