Browse Source

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.
master
Ludovic Courtès 1 year ago
parent
commit
5dfe02c607
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
3 changed files with 17 additions and 15 deletions
  1. +12
    -11
      tests/crate.scm
  2. +1
    -1
      tests/gem.scm
  3. +4
    -3
      tests/pypi.scm

+ 12
- 11
tests/crate.scm View File

@@ -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"


+ 1
- 1
tests/gem.scm View File

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


+ 4
- 3
tests/pypi.scm View File

@@ -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"


Loading…
Cancel
Save