Add settings.py that gets environment variables

like IMAGE_NAME, OS, VERSION

and import them in PyTest suite

Signed-off-by: Petr "Stone" Hracek <[email protected]>

Author: phracek

2.4-micro/test/settings.py

@@ -0,0 +1 @@
+../../test/settings.py

2.4/test/settings.py

@@ -0,0 +1 @@
+../../test/settings.py

test/settings.py

@@ -0,0 +1,9 @@
+import os
+
+from pathlib import Path
+
+
+VERSION = os.getenv("VERSION")
+OS = os.getenv("OS").lower()
+IMAGE_NAME = os.getenv("IMAGE_NAME")
+TEST_DIR = Path(__file__).parent.absolute()

test/test_container_httpd.py

@@ -1,24 +1,12 @@
-import os
-import sys
 import re
 import tempfile
 
-from pathlib import Path
-
 import pytest
 
 from container_ci_suite.container_lib import ContainerTestLib
-from container_ci_suite.utils import ContainerTestLibUtils, check_variables
-
-
-if not check_variables():
-    sys.exit(1)
-
+from container_ci_suite.utils import ContainerTestLibUtils
 
-TEST_DIR = Path(__file__).parent.absolute()
-VERSION = os.getenv("VERSION")
-OS = os.getenv("OS").lower()
-IMAGE_NAME = os.getenv("IMAGE_NAME")
+from settings import IMAGE_NAME, TEST_DIR
 
 
 class TestHttpdAppContainer:

test/test_container_httpd_s2i.py

@@ -1,22 +1,13 @@
-import os
-import sys
 import time
 import tempfile
 
 from pathlib import Path
 
 from container_ci_suite.container_lib import ContainerTestLib
-from container_ci_suite.utils import ContainerTestLibUtils, check_variables
+from container_ci_suite.utils import ContainerTestLibUtils
 from container_ci_suite.engines.podman_wrapper import PodmanCLIWrapper
 
-if not check_variables():
-    sys.exit(1)
-
-TEST_DIR = Path(__file__).parent.absolute()
-VERSION = os.getenv("VERSION")
-OS = os.getenv("OS").lower()
-IMAGE_NAME = os.getenv("IMAGE_NAME")
-
+from settings import IMAGE_NAME, TEST_DIR
 
 pre_init_test_app = TEST_DIR / "pre-init-test-app"
 sample_test_app = TEST_DIR / "sample-test-app"