From b127f89f93106b7a91a3ffe2463c4f8ecb77cb0a Mon Sep 17 00:00:00 2001
From: "Petr \"Stone\" Hracek" <phracek@redhat.com>
Date: Wed, 13 Nov 2024 13:08:57 +0100
Subject: [PATCH] Fix Helm charts tests for Python

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
---
 tests/test_python_django_app.py             | 10 +++++++---
 tests/test_python_django_psql_persistent.py | 12 ++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/tests/test_python_django_app.py b/tests/test_python_django_app.py
index 72c02c3..6b81048 100644
--- a/tests/test_python_django_app.py
+++ b/tests/test_python_django_app.py
@@ -38,16 +38,18 @@ def test_django_application_curl_output(self, version, branch):
         assert self.hc_api.helm_installation()
         self.hc_api.package_name = "python-django-application"
         self.hc_api.helm_package()
+        pod_name = f"django-{version}".replace(".", "-")
         assert self.hc_api.helm_installation(
             values={
                 "python_version": version,
                 "namespace": self.hc_api.namespace,
                 "source_repository_ref": branch,
+                "name": pod_name
             }
         )
-        assert self.hc_api.is_s2i_pod_running(pod_name_prefix="django-example")
+        assert self.hc_api.is_s2i_pod_running(pod_name_prefix=pod_name, timeout=600)
         assert self.hc_api.test_helm_curl_output(
-            route_name="django-example",
+            route_name=pod_name,
             expected_str="Welcome to your Django application"
         )
 
@@ -69,12 +71,14 @@ def test_django_application_helm_test(self, version, branch):
         assert self.hc_api.helm_installation()
         self.hc_api.package_name = "python-django-application"
         assert self.hc_api.helm_package()
+        pod_name = f"django-{version}".replace(".", "-")
         assert self.hc_api.helm_installation(
             values={
                 "python_version": version,
                 "namespace": self.hc_api.namespace,
                 "source_repository_ref": branch,
+                "name": pod_name
             }
         )
-        assert self.hc_api.is_s2i_pod_running(pod_name_prefix="django-example", timeout=300)
+        assert self.hc_api.is_s2i_pod_running(pod_name_prefix=pod_name, timeout=600)
         assert self.hc_api.test_helm_chart(expected_str=["Welcome to your Django application"])
diff --git a/tests/test_python_django_psql_persistent.py b/tests/test_python_django_psql_persistent.py
index 9e49e98..6f01cb4 100644
--- a/tests/test_python_django_psql_persistent.py
+++ b/tests/test_python_django_psql_persistent.py
@@ -41,16 +41,18 @@ def test_django_psql_curl_output(self, version, branch):
         assert self.hc_api.helm_installation()
         self.hc_api.package_name = "django-psql-persistent"
         assert self.hc_api.helm_package()
+        pod_name = f"django-psql-{version}".replace(".", "-")
         assert self.hc_api.helm_installation(
             values={
                 "python_version": version,
                 "namespace": self.hc_api.namespace,
                 "source_repository_ref": branch,
+                "name": pod_name
             }
         )
-        assert self.hc_api.is_s2i_pod_running(pod_name_prefix="django-psql")
+        assert self.hc_api.is_s2i_pod_running(pod_name_prefix=pod_name)
         assert self.hc_api.test_helm_curl_output(
-            route_name="django-psql",
+            route_name=pod_name,
             expected_str="Welcome to your Django application"
         )
 
@@ -78,13 +80,15 @@ def test_django_psql_helm_test(self, version, branch):
         assert self.hc_api.helm_installation()
         self.hc_api.package_name = "django-psql-persistent"
         assert self.hc_api.helm_package()
+        pod_name = f"django-psql-{version}".replace(".", "-")
         assert self.hc_api.helm_installation(
             values={
                 "python_version": version,
                 "namespace": self.hc_api.namespace,
                 "source_repository_ref": branch,
-                "postgresql_version": "15-el9"
+                "postgresql_version": "15-el9",
+                "name": pod_name
             }
         )
-        assert self.hc_api.is_s2i_pod_running(pod_name_prefix="django-psql", timeout=360)
+        assert self.hc_api.is_s2i_pod_running(pod_name_prefix=pod_name, timeout=600)
         assert self.hc_api.test_helm_chart(expected_str=["Welcome to your Django application"])