Add TEST_DIR to VARS

Author: frenzymadness

test/conftest.py

@@ -1,5 +1,6 @@
 from collections import namedtuple
 import os
+from pathlib import Path
 import sys
 
 from container_ci_suite.utils import check_variables
@@ -16,7 +17,8 @@
     IMAGE_NAME=os.getenv("IMAGE_NAME"),
     IS_MINIMAL="minimal" in VERSION,
     VERSION_NO_MINIMAL=VERSION.replace("-minimal", ""),
-    SHORT_VERSION=VERSION.replace("-minimal", "").replace(".", "")
+    SHORT_VERSION=VERSION.replace("-minimal", "").replace(".", ""),
+    TEST_DIR=Path(__file__).parent.absolute()
 )
 
 

test/test_helm_python_django_app.py

@@ -1,13 +1,8 @@
-import os
-
-from pathlib import Path
-
 from container_ci_suite.helm import HelmChartsAPI
 
 from constants import TAGS, BRANCH_TO_TEST
 from conftest import skip_helm_charts_tests, VARS
 
-test_dir = Path(os.path.abspath(os.path.dirname(__file__)))
 
 TAG = TAGS.get(VARS.OS)
 DEPLOYED_PSQL_IMAGE = "quay.io/sclorg/postgresql-10-c8s:c8s"
@@ -24,8 +19,7 @@ class TestHelmPythonDjangoAppTemplate:
 
     def setup_method(self):
         package_name = "redhat-python-django-application"
-        path = test_dir
-        self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir, shared_cluster=True)
+        self.hc_api = HelmChartsAPI(path=VARS.TEST_DIR, package_name=package_name, tarball_dir=VARS.TEST_DIR, shared_cluster=True)
         self.hc_api.clone_helm_chart_repo(
             repo_url="https://github.com/sclorg/helm-charts", repo_name="helm-charts",
             subdir="charts/redhat"

test/test_helm_python_django_psql_persistent.py

@@ -1,14 +1,8 @@
-import os
-
-from pathlib import Path
-
 from container_ci_suite.helm import HelmChartsAPI
 
 from constants import TAGS, BRANCH_TO_TEST
 from conftest import skip_helm_charts_tests, VARS
 
-test_dir = Path(os.path.abspath(os.path.dirname(__file__)))
-
 TAG = TAGS.get(VARS.OS)
 if VARS.VERSION in ("3.11", "3.12", "3.12-minimal"):
     BRANCH_TO_TEST = "4.2.x"
@@ -18,8 +12,7 @@ class TestHelmPythonDjangoPsqlTemplate:
 
     def setup_method(self):
         package_name = "redhat-django-psql-persistent"
-        path = test_dir
-        self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir, shared_cluster=True)
+        self.hc_api = HelmChartsAPI(path=VARS.TEST_DIR, package_name=package_name, tarball_dir=VARS.TEST_DIR, shared_cluster=True)
         self.hc_api.clone_helm_chart_repo(
             repo_url="https://github.com/sclorg/helm-charts", repo_name="helm-charts",
             subdir="charts/redhat"

test/test_helm_python_imagestreams.py

@@ -1,19 +1,14 @@
-import os
-
 import pytest
-from pathlib import Path
 
 from container_ci_suite.helm import HelmChartsAPI
 
-test_dir = Path(os.path.abspath(os.path.dirname(__file__)))
-
+from conftest import VARS
 
 class TestHelmRHELPythonImageStreams:
 
     def setup_method(self):
         package_name = "redhat-python-imagestreams"
-        path = test_dir
-        self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir, shared_cluster=True)
+        self.hc_api = HelmChartsAPI(path=VARS.TEST_DIR, package_name=package_name, tarball_dir=VARS.TEST_DIR, shared_cluster=True)
         self.hc_api.clone_helm_chart_repo(
             repo_url="https://github.com/sclorg/helm-charts", repo_name="helm-charts",
             subdir="charts/redhat"

test/test_latest_imagestreams.py

@@ -1,17 +1,13 @@
-import os
-
-from pathlib import Path
-
 from container_ci_suite.imagestreams import ImageStreamChecker
 
-TEST_DIR = Path(os.path.abspath(os.path.dirname(__file__)))
+from conftest import VARS
 
 
 # Replacement with 'test_latest_imagestreams'
 class TestLatestImagestreams:
 
     def setup_method(self):
-        self.isc = ImageStreamChecker(working_dir=TEST_DIR.parent.parent)
+        self.isc = ImageStreamChecker(working_dir=VARS.TEST_DIR.parent.parent)
 
     def test_latest_imagestream(self):
         self.latest_version = self.isc.get_latest_version()