solver: include "solver" key in the dnfjson reply
This commit includes the used sovler in the dnfjson reply. This is mostly information (e.g. in service logs) but also useful in tests to ensure that the expected solver was really run. Note that this needs https://github.com/osbuild/images/pull/723 first.
This commit is contained in:
parent
b516bdca93
commit
ae72480612
3 changed files with 11 additions and 0 deletions
|
|
@ -306,6 +306,7 @@ class DNF(SolverBase):
|
|||
"sslclientcert": repo.sslclientcert,
|
||||
}
|
||||
response = {
|
||||
"solver": "dnf",
|
||||
"packages": packages,
|
||||
"repos": repositories,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -429,6 +429,7 @@ class DNF5(SolverBase):
|
|||
"sslcacert": get_string_option(repo_cfg.get_sslcacert_option()),
|
||||
}
|
||||
response = {
|
||||
"solver": "dnf5",
|
||||
"packages": packages,
|
||||
"repos": repositories,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -302,3 +302,12 @@ def test_depsolve(tmp_path, repo_servers, dnf_config, detect_fn, test_case):
|
|||
assert n_filelist_files == len(REPO_PATHS)
|
||||
else:
|
||||
assert n_filelist_files == 0
|
||||
|
||||
if dnf_config:
|
||||
use_dnf5 = json.loads(dnf_config)["use_dnf5"]
|
||||
else:
|
||||
use_dnf5 = False
|
||||
if use_dnf5:
|
||||
assert res["solver"] == "dnf5"
|
||||
else:
|
||||
assert res["solver"] == "dnf"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue