Install imagestreams in test directly not in constructor.

In case of failure during construct, then 'teardown_methon' is not called and project is not deleted The postgresql helm-chart is updated as well Signed-off-by: Petr "Stone" Hracek <[email protected]>
sclorg · Nov 4, 2024 · ebc7288 · ebc7288
1 parent 39f428d
commit ebc7288
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/tests/test_mariadb_template.py b/tests/test_mariadb_template.py
@@ -14,9 +14,6 @@ def setup_method(self):
         package_name = "mariadb-persistent"
         path = test_dir / "../charts/redhat"
         self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir)
-        self.hc_api.package_name = "mariadb-imagestreams"
-        assert self.hc_api.helm_package()
-        assert self.hc_api.helm_installation()
 
     def teardown_method(self):
         self.hc_api.delete_project()
@@ -32,13 +29,18 @@ def teardown_method(self):
         ],
     )
     def test_package_persistent(self, version):
+        self.hc_api.package_name = "mariadb-imagestreams"
+        assert self.hc_api.helm_package()
+        assert self.hc_api.helm_installation()
         self.hc_api.package_name = "mariadb-persistent"
         assert self.hc_api.helm_package()
+        pod_name = f"mariadb-{version}".replace(".", "")
         assert self.hc_api.helm_installation(
             values={
                 "mariadb_version": version,
                 "namespace": self.hc_api.namespace,
+                "name": pod_name
             }
         )
-        assert self.hc_api.is_pod_running(pod_name_prefix="mariadb")
+        assert self.hc_api.is_pod_running(pod_name_prefix=pod_name)
         assert self.hc_api.test_helm_chart(expected_str=["42", "testval"])
diff --git a/tests/test_mysql_template.py b/tests/test_mysql_template.py
@@ -14,9 +14,6 @@ def setup_method(self):
         package_name = "mysql-persistent"
         path = test_dir / "../charts/redhat"
         self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir)
-        self.hc_api.package_name = "mysql-imagestreams"
-        assert self.hc_api.helm_package()
-        assert self.hc_api.helm_installation()
 
     def teardown_method(self):
         self.hc_api.delete_project()
@@ -29,14 +26,18 @@ def teardown_method(self):
         ],
     )
     def test_package_persistent(self, version):
-
+        self.hc_api.package_name = "mysql-imagestreams"
+        assert self.hc_api.helm_package()
+        assert self.hc_api.helm_installation()
         self.hc_api.package_name = "mysql-persistent"
         assert self.hc_api.helm_package()
+        pod_name = f"mysql-{version}".replace(".", "")
         assert self.hc_api.helm_installation(
             values={
                 "mysql_version": version,
-                "namespace": self.hc_api.namespace
+                "namespace": self.hc_api.namespace,
+                "name": pod_name
             }
         )
-        assert self.hc_api.is_pod_running(pod_name_prefix="mysql")
+        assert self.hc_api.is_pod_running(pod_name_prefix=pod_name)
         assert self.hc_api.test_helm_chart(expected_str=["42", "testval"])
diff --git a/tests/test_postgresql_template.py b/tests/test_postgresql_template.py
@@ -35,6 +35,11 @@ def test_package_persistent(self, version):
         assert self.hc_api.helm_installation()
         self.hc_api.package_name = "postgresql-persistent"
         assert self.hc_api.helm_package()
-        assert self.hc_api.helm_installation(values={".image.tag": version, ".namespace": self.hc_api.namespace})
+        assert self.hc_api.helm_installation(
+            values={
+                "image.tag": version,
+                "namespace": self.hc_api.namespace
+            }
+        )
         assert self.hc_api.is_pod_running(pod_name_prefix="postgresql-persistent")
         assert self.hc_api.test_helm_chart(expected_str=["accepting connection"])
diff --git a/tests/test_redis_template.py b/tests/test_redis_template.py
@@ -14,9 +14,6 @@ def setup_method(self):
         package_name = "redis-persistent"
         path = test_dir / "../charts/redhat"
         self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir)
-        self.hc_api.package_name = "redis-imagestreams"
-        assert self.hc_api.helm_package()
-        assert self.hc_api.helm_installation()
 
     def teardown_method(self):
         self.hc_api.delete_project()
@@ -29,7 +26,9 @@ def teardown_method(self):
         ],
     )
     def test_package_persistent(self, version):
-
+        self.hc_api.package_name = "redis-imagestreams"
+        assert self.hc_api.helm_package()
+        assert self.hc_api.helm_installation()
         self.hc_api.package_name = "redis-persistent"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation(