additional review feedback

SUSE · Jul 7, 2023 · e17af7b · e17af7b
1 parent 72886e0
commit e17af7b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 21 deletions.
diff --git a/bci_tester/data.py b/bci_tester/data.py
@@ -107,14 +107,14 @@
         BASEURL = BASEURL[:-1]
 else:
     if OS_VERSION == "tumbleweed":
-        distname = "tumbleweed"
+        DISTNAME = "tumbleweed"
     else:
-        distname = f"sle-{OS_MAJOR_VERSION}-sp{OS_SP_VERSION}"
+        DISTNAME = f"sle-{OS_MAJOR_VERSION}-sp{OS_SP_VERSION}"
     BASEURL = {
-        "obs": f"registry.opensuse.org/devel/bci/{distname}",
-        "ibs": f"registry.suse.de/suse/{distname}/update/bci",
+        "obs": f"registry.opensuse.org/devel/bci/{DISTNAME}",
+        "ibs": f"registry.suse.de/suse/{DISTNAME}/update/bci",
         "dso": "registry1.dso.mil/ironbank/suse",
-        "ibs-cr": f"registry.suse.de/suse/{distname}/update/cr/totest",
+        "ibs-cr": f"registry.suse.de/suse/{DISTNAME}/update/cr/totest",
     }[TARGET]
 
 

diff --git a/tests/test_metadata.py b/tests/test_metadata.py
@@ -71,6 +71,12 @@
 URL = "https://www.suse.com/products/server/"
 
 
+SKIP_IF_TW_MARK = pytest.mark.skipif(
+    OS_VERSION == "tumbleweed",
+    reason="no supportlevel labels on openSUSE containers",
+)
+
+
 def _get_container_label_prefix(
     container_name: str, container_type: ImageType
 ) -> str:
@@ -338,10 +344,7 @@ def test_disturl_can_be_checked_out(
     check_output(["osc", "co", disturl], cwd=tmp_path)
 
 
-@pytest.mark.skipif(
-    OS_VERSION == "tumbleweed",
-    reason="no image-type labels on openSUSE containers",
-)
+@SKIP_IF_TW_MARK
 @pytest.mark.parametrize(
     "container,container_type",
     [
@@ -370,10 +373,7 @@ def test_image_type_label(
         ), "sle-bci images must be marked as such"
 
 
-@pytest.mark.skipif(
-    OS_VERSION == "tumbleweed",
-    reason="no supportlevel labels on openSUSE containers",
-)
+@SKIP_IF_TW_MARK
 @pytest.mark.parametrize(
     "container",
     [
@@ -394,10 +394,7 @@ def test_techpreview_label(container: ContainerData):
     ), "images must be marked as techpreview"
 
 
-@pytest.mark.skipif(
-    OS_VERSION == "tumbleweed",
-    reason="no supportlevel labels on openSUSE containers",
-)
+@SKIP_IF_TW_MARK
 @pytest.mark.parametrize(
     "container",
     [cont for cont in ACC_CONTAINERS],
@@ -413,10 +410,7 @@ def test_acc_label(container: ContainerData):
     ), "acc images must be marked as acc"
 
 
-@pytest.mark.skipif(
-    OS_VERSION == "tumbleweed",
-    reason="no supportlevel labels on openSUSE containers",
-)
+@SKIP_IF_TW_MARK
 @pytest.mark.parametrize("container", L3_CONTAINERS, indirect=True)
 def test_l3_label(container: ContainerData):
     """Check that containers under L3 support have the label