ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

[9.18] fix: ci: Add ns2/managed1.conf to mkeys extra_artifacts

Browse Source 
The ns2/managed1.conf file is created by the setup.sh script. Then, in
the tests.sh script it is moved to ns2/managed.conf. The latter file
name is in mkeys extra_artifacts, but the former one is not. This is a
problem when pytest is started with the --setup-only option as it only
runs the setup.sh script (e.g., in the cross-version-config-tests CI
job) and thus failing the "Unexpected files found" assertion.

Backport of MR !9815

Merge branch 'backport-mnowak/mkeys-add-ns2-managed1-conf-to-extra-artifacts-9.18' into 'bind-9.18'

See merge request isc-projects/bind9!9825
This commit is contained in:
Michal Nowak
2024-12-05 10:47:59 +00:00
parent 1d4e60c9ba 2f093e7c95
commit 55475d9357
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/tests/system/mkeys/tests_sh_mkeys.py
View File

@@ -36,6 +36,7 @@ pytestmark = pytest.mark.extra_artifacts(
"ns1/root.db.tmp",
"ns1/zone.key",
"ns2/managed-keys.bind",
"ns2/managed1.conf",
"ns3/broken.conf",
"ns3/managed-keys.bind",
"ns4/nope",