Instead of 'echo' let's use 'env' and grep to PYTHON_VERSION

variable.

Afterwards let's check right side of the variable against 'python
--version'

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

Author: phracek

test/test_container_application.py

@@ -49,7 +49,7 @@ def test_application(self, build_s2i_app, container_args):
         python_version_output = PodmanCLIWrapper.podman_run_command_and_remove(
             cid_file_name=VARS.IMAGE_NAME, cmd="python --version"
         )
-        assert f"Python {python_version}." in python_version_output
+        assert f"Python {VARS.VERSION_NO_MINIMAL}." in python_version_output
         cip = build_s2i_app.get_cip(cid_file_name=cid_file_name)
         assert cip
         port = 8080
@@ -102,14 +102,14 @@ def test_unstable_test(self, unstable_app):
             cid_file_name=cid_file_name,
             container_args=s2i_app_unstable,
         )
-        assert ContainerImage.wait_for_cid(cid_file_name=cid_file_name)
         python_version = PodmanCLIWrapper.podman_run_command_and_remove(
-            cid_file_name=VARS.IMAGE_NAME, cmd="echo \\$PYTHON_VERSION"
+            cid_file_name=VARS.IMAGE_NAME, cmd="env | grep PYTHON_VERSION"
         ).strip()
+        assert ContainerImage.wait_for_cid(cid_file_name=cid_file_name)
         python_version_output = PodmanCLIWrapper.podman_run_command_and_remove(
             cid_file_name=VARS.IMAGE_NAME, cmd="python --version"
         )
-        assert f"Python {python_version}." in python_version_output
+        assert f"Python {python_version.split('=')[1]}." in python_version_output
         cip = s2i_app_unstable.get_cip(cid_file_name=cid_file_name)
         assert cip
         port = 8080

test/test_container_basics.py

@@ -48,12 +48,12 @@ def test_scl_usage(self):
         Test if python --version returns proper output
         """
         python_version = PodmanCLIWrapper.podman_run_command_and_remove(
-            cid_file_name=VARS.IMAGE_NAME, cmd="echo \\$PYTHON_VERSION"
+            cid_file_name=VARS.IMAGE_NAME, cmd="env | grep PYTHON_VERSION"
         ).strip()
         python_version_output = PodmanCLIWrapper.podman_run_command_and_remove(
             cid_file_name=VARS.IMAGE_NAME, cmd="python --version"
         )
-        assert f"Python {python_version}." in python_version_output
+        assert f"Python {python_version.split('=')[1]}." in python_version_output
         if not VARS.IS_MINIMAL:
             assert (
                 re.search(