diff --git a/test/data/testrepos/README.md b/test/data/testrepos/README.md index f521c54d..8772bcbf 100644 --- a/test/data/testrepos/README.md +++ b/test/data/testrepos/README.md @@ -7,16 +7,16 @@ Each subdirectory contains repository metadata that is served by a server during ```bash rpmdir=$(mktemp -d) -cat < "${rpmdir}/nothing.spec" +cat < "${rpmdir}/pkg-with-no-deps.spec" #----------- spec file starts --------------- -Name: nothing +Name: pkg-with-no-deps Version: 1.0.0 Release: 0 BuildArch: noarch Vendor: noone Summary: Provides %{name} License: BSD -Provides: nothing +Provides: pkg-with-no-deps %description %{summary} @@ -24,7 +24,7 @@ Provides: nothing %files EOF -rpmbuild --quiet --define "_topdir ${rpmdir}" -bb "${rpmdir}/nothing.spec" +rpmbuild --quiet --define "_topdir ${rpmdir}" -bb "${rpmdir}/pkg-with-no-deps.spec" createrepo "${rpmdir}/RPMS/noarch/" mkdir -p ./test/data/testrepos/custom cp -a "${rpmdir}/RPMS/noarch/repodata" ./test/data/testrepos/custom diff --git a/test/data/testrepos/custom/repodata/repomd.xml b/test/data/testrepos/custom/repodata/repomd.xml index d100c73b..e0e007aa 100644 --- a/test/data/testrepos/custom/repodata/repomd.xml +++ b/test/data/testrepos/custom/repodata/repomd.xml @@ -1,28 +1,55 @@ - 1711036975 + 1712239547 - d13ac184dc585096c46f012180458480279d1ec0ce9382a574ab498cb2c55795 - 9c599fb11fa679526ecb89070f9b878b124f9ca65b88a78e3af36cbc06452439 - - 1711036975 - 569 - 1102 + 31724d01e30b0e3aa99db0e108116932c1e652d9357cde29bb61c1d40032b1a7 + 8cb804da6d5cb5547b4200886880c802d78d2aba5aaa87b4c11b72a2a44d0d71 + + 1712239547 + 564 + 1164 - 4af4575ea55e40293989e81f9e3e9328a97c9c3b293cc69b02f6bd6cdb8f84c6 - 828a8c2e757f3b1a51f09e48f342eedcc2eabf733e69ca6376266025d4de1325 - - 1711036975 - 227 - 291 + e54003a8999ecdb08a48724ccc1b5252890d5f8924e0e1c5ca0b4235caebc2e8 + c0cee67acefd24e52209043e5371aeb26632b0fee6a893c5dc8aa8fed6c5d8d8 + + 1712239547 + 235 + 300 - 12f698f748c6bf69c336ea9299b6ad622c83cd3402eb3c37a9984ae65d318c8f - 2b30284c414f2d9ffc2f61f80b575b146cb39151f01cdcfb8736100873f82afe - - 1711036975 - 225 - 287 + cfedfc89f8594ac0241fc1447e7521a7be3ffd1e46afee390d7f966a5a16ae7f + bc80506f743a278c60a7480823af43d114bdd540a0e022bb8434a2fe94b174ed + + 1712239547 + 234 + 296 + + + 7eeb8dd6640fcc6ad9f72f57c29b55d42f9a1160cca99d899e27f08fe160b4f9 + 7395c5ab568d723e6d2d2362af8995139e0684b66b1b5276ff5f41716a583ca0 + + 1712239547 + 1715 + 106496 + 10 + + + 9bc2044bec0de9b0ed1bda5a03c3c7348218691adce04d75d25563714533f116 + 3de4900d06a729a1254abfd2be1ac47d158ef10fbfb3b3bf40ba03e51a0dccea + + 1712239547 + 690 + 28672 + 10 + + + 03836ef5b4baf5161a7fb1c7a13cfdc6774091ce5e971eb3bb6b64bf4e5afd0b + f1cf95b0e8ce808d952325d45f2818a68e765556fde7a4247b8b91686f7010f9 + + 1712239547 + 669 + 24576 + 10 diff --git a/tools/osbuild-depsolve-dnf5 b/tools/osbuild-depsolve-dnf5 index 1bfe343f..fe42fd2e 100755 --- a/tools/osbuild-depsolve-dnf5 +++ b/tools/osbuild-depsolve-dnf5 @@ -2,7 +2,7 @@ # pylint: disable=invalid-name """ -A JSON-based interface for depsolving using DNF. +A JSON-based interface for depsolving using DNF5. Reads a request through stdin and prints the result to stdout. In case of error, a structured error is printed to stdout as well. diff --git a/tools/test/test_depsolve.py b/tools/test/test_depsolve.py index 063b9299..4cfe53e3 100644 --- a/tools/test/test_depsolve.py +++ b/tools/test/test_depsolve.py @@ -95,15 +95,15 @@ test_cases = [ } }, { - # "nothing" is the only package in the custom repo and has no dependencies - "packages": ["nothing"], + # "pkg-with-no-deps" is the only package in the custom repo and has no dependencies + "packages": ["pkg-with-no-deps"], "results": { - "packages": {"nothing"}, + "packages": {"pkg-with-no-deps"}, "reponames": {"custom"}, }, }, { - "packages": ["filesystem", "nothing"], + "packages": ["filesystem", "pkg-with-no-deps"], "results": { "packages": { "basesystem", @@ -120,7 +120,7 @@ test_cases = [ "ncurses-libs", "setup", "tzdata", - "nothing", + "pkg-with-no-deps", }, "reponames": { "baseos", @@ -129,7 +129,7 @@ test_cases = [ }, }, { - "packages": ["tmux", "nothing"], + "packages": ["tmux", "pkg-with-no-deps"], "results": { "packages": { "alternatives", @@ -171,7 +171,7 @@ test_cases = [ "tmux", "tzdata", "zlib", - "nothing", + "pkg-with-no-deps", }, "reponames": { "baseos",