aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrangé <berrange@redhat.com>2024-04-29 18:29:57 +0100
committerDaniel P. Berrangé <berrange@redhat.com>2024-04-29 18:36:19 +0100
commitf1645c1b2f1bc4c5e8a919092b3de3bb0f4f2b19 (patch)
treea33c544be52a32c722fee8a850157688da5b0c57
parent59092ba0d104752062f8ca20f2e2518ae3c1ea18 (diff)
downloadlibvirt-ci-f1645c1b2f1bc4c5e8a919092b3de3bb0f4f2b19.zip
libvirt-ci-f1645c1b2f1bc4c5e8a919092b3de3bb0f4f2b19.tar.gz
libvirt-ci-f1645c1b2f1bc4c5e8a919092b3de3bb0f4f2b19.tar.bz2
tests: change tests to use CentOS Stream9
We are about to remove the CentOS Stream8 target, so the unit tests need updating to use a different arget. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-rw-r--r--tests/data/inventory/in/inventory/sample8
-rw-r--r--tests/data/packages/override/mappings.yml4
-rw-r--r--tests/data/targets/override/targets/centos-stream-9.yml (renamed from tests/data/targets/override/targets/centos-stream-8.yml)0
-rw-r--r--tests/test_inventory.py8
-rw-r--r--tests/test_packages.py2
-rw-r--r--tests/test_targets.py2
6 files changed, 12 insertions, 12 deletions
diff --git a/tests/data/inventory/in/inventory/sample b/tests/data/inventory/in/inventory/sample
index 79a8c81..ad5dcfb 100644
--- a/tests/data/inventory/in/inventory/sample
+++ b/tests/data/inventory/in/inventory/sample
@@ -1,7 +1,7 @@
-[centos-stream-8]
-centos-stream-8-1
-centos-stream-8-2
-some-other-centos-stream-8
+[centos-stream-9]
+centos-stream-9-1
+centos-stream-9-2
+some-other-centos-stream-9
[fedora-39]
fedora-test-1
diff --git a/tests/data/packages/override/mappings.yml b/tests/data/packages/override/mappings.yml
index 7b11bfb..d43ca72 100644
--- a/tests/data/packages/override/mappings.yml
+++ b/tests/data/packages/override/mappings.yml
@@ -1,9 +1,9 @@
mappings:
meson:
- CentOSStream8:
+ CentOSStream9:
python3:
- CentOSStream8: python38
+ CentOSStream9: python38
pypi_mappings:
meson:
diff --git a/tests/data/targets/override/targets/centos-stream-8.yml b/tests/data/targets/override/targets/centos-stream-9.yml
index 6b11160..6b11160 100644
--- a/tests/data/targets/override/targets/centos-stream-8.yml
+++ b/tests/data/targets/override/targets/centos-stream-9.yml
diff --git a/tests/test_inventory.py b/tests/test_inventory.py
index 165e7cd..73c667f 100644
--- a/tests/test_inventory.py
+++ b/tests/test_inventory.py
@@ -27,7 +27,7 @@ def inventory(targets):
@pytest.mark.parametrize("host,target,fully_managed", [
- pytest.param("centos-stream-8-1", "centos-stream-8", False, id="centos-stream-8-1"),
+ pytest.param("centos-stream-9-1", "centos-stream-9", False, id="centos-stream-9-1"),
pytest.param("192.168.1.30", "debian-12", False, id="debian-12"),
pytest.param("fedora-test-2", "fedora-39", True, id="fedora-test-2"),
])
@@ -41,9 +41,9 @@ def test_host_facts(inventory, targets, host, target, fully_managed):
def test_expand_hosts(inventory):
assert sorted(inventory.expand_hosts("*centos*")) == [
- "centos-stream-8-1",
- "centos-stream-8-2",
- "some-other-centos-stream-8"
+ "centos-stream-9-1",
+ "centos-stream-9-2",
+ "some-other-centos-stream-9"
]
with pytest.raises(InventoryError):
inventory.expand_hosts("debian-12")
diff --git a/tests/test_packages.py b/tests/test_packages.py
index bca8966..b655b47 100644
--- a/tests/test_packages.py
+++ b/tests/test_packages.py
@@ -92,7 +92,7 @@ def test_package_resolution(assert_equal, targets, packages, test_project,
def test_resolution_override(targets, test_project):
datadir = DataDir(Path(test_utils.test_data_dir(__file__), 'override'))
packages = Packages(datadir)
- target_obj = BuildTarget(targets, packages, "centos-stream-8")
+ target_obj = BuildTarget(targets, packages, "centos-stream-9")
pkgs = test_project.get_packages(target_obj)
assert isinstance(pkgs['meson'], PyPIPackage)
diff --git a/tests/test_targets.py b/tests/test_targets.py
index 9a76fc1..33cb9c7 100644
--- a/tests/test_targets.py
+++ b/tests/test_targets.py
@@ -42,7 +42,7 @@ def test_group_vars(targets, target):
def test_override():
datadir = DataDir(Path(test_utils.test_data_dir(__file__), 'override'))
targets = Targets(datadir)
- facts = targets.target_facts['centos-stream-8']
+ facts = targets.target_facts['centos-stream-9']
assert facts["paths"]["pip3"] == "/usr/bin/pip3.8"
assert facts["paths"]["python"] == "/usr/bin/python3.8"