particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools/test/depsolve: clean up test_depsolve_result_api()

Browse source 
The `test_depsolve_result_api()` test case was parametrized based on
`dnf_config`, but in reality, the `depsolve()` call always used an
empty dict as `dnf_config`. Effectively, it was being tested three
times with DNF4.

In addition, don't pass optional arguments to `depsolve()`.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2025-02-14 13:29:54 +01:00 • committed by Tomáš Hozza
parent e635a8a067
commit 3743654178
1 changed files with 9 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

30
tools/test/test_depsolve.py
View file

@ -1544,18 +1544,17 @@ def test_search(tmp_path, repo_servers, dnf_config, detect_fn, test_case):
assert n_filelist_files == 0
@pytest.mark.parametrize("dnf_config, detect_fn", [
(None, assert_dnf),
('{"use_dnf5": false}', assert_dnf),
('{"use_dnf5": true}', assert_dnf5),
], ids=["no-config", "dnf4", "dnf5"])
def test_depsolve_result_api(tmp_path, repo_servers, dnf_config, detect_fn):
def test_depsolve_result_api(tmp_path, repo_servers):
"""
Test the result of depsolve() API.
Note tha this test runs only with dnf4, as the dnf5 depsolver does not support modules.
"""
try:
detect_fn()
assert_dnf()
except RuntimeError as e:
pytest.skip(str(e))
root_dir = tmp_path.as_posix()
cache_dir = (tmp_path / "depsolve-cache").as_posix()
transactions = [
{
@ -1564,19 +1563,8 @@ def test_depsolve_result_api(tmp_path, repo_servers, dnf_config, detect_fn):
},
]
repo_configs = []
for server in repo_servers:
repo_configs.append({
"id": server["name"],
"name": server["name"],
"baseurl": server["address"],
"gpgkeys": [TEST_KEY + server["name"]],
})
dnf_config = {}
opt_metadata = []
with_sbom = False
res, exit_code = depsolve(transactions, cache_dir, dnf_config, repo_configs, root_dir, opt_metadata, with_sbom)
repo_configs = [gen_repo_config(server) for server in repo_servers]
res, exit_code = depsolve(transactions, cache_dir, repos=repo_configs)
assert exit_code == 0
# If any of this changes, increase: