From f1645c1b2f1bc4c5e8a919092b3de3bb0f4f2b19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Mon, 29 Apr 2024 18:29:57 +0100
Subject: tests: change tests to use CentOS Stream9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 tests/data/inventory/in/inventory/sample                | 8 ++++----
 tests/data/packages/override/mappings.yml               | 4 ++--
 tests/data/targets/override/targets/centos-stream-8.yml | 3 ---
 tests/data/targets/override/targets/centos-stream-9.yml | 3 +++
 tests/test_inventory.py                                 | 8 ++++----
 tests/test_packages.py                                  | 2 +-
 tests/test_targets.py                                   | 2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 tests/data/targets/override/targets/centos-stream-8.yml
 create mode 100644 tests/data/targets/override/targets/centos-stream-9.yml

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-8.yml
deleted file mode 100644
index 6b11160..0000000
--- a/tests/data/targets/override/targets/centos-stream-8.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-paths:
-  pip3: /usr/bin/pip3.8
-  python: /usr/bin/python3.8
diff --git a/tests/data/targets/override/targets/centos-stream-9.yml b/tests/data/targets/override/targets/centos-stream-9.yml
new file mode 100644
index 0000000..6b11160
--- /dev/null
+++ b/tests/data/targets/override/targets/centos-stream-9.yml
@@ -0,0 +1,3 @@
+paths:
+  pip3: /usr/bin/pip3.8
+  python: /usr/bin/python3.8
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"
-- 
cgit v1.1