Fix tests

Signed-off-by: Petr "Stone" Hracek <[email protected]>
sclorg · Dec 11, 2023 · 0d17a5c · 0d17a5c
1 parent 7d282bd
commit 0d17a5c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/charts/redhat/postgresql-persistent/src/templates/deployment.yaml b/charts/redhat/postgresql-persistent/src/templates/deployment.yaml
@@ -17,7 +17,7 @@ metadata:
     template: postgresql-persistent-template
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-  name: {{ .Release.Namespace }}
+  name: {{ .Release.Name }}
 spec:
   replicas: 1
   selector:
@@ -56,7 +56,7 @@ spec:
             - --live
           initialDelaySeconds: 120
           timeoutSeconds: 10
-        name: "postgresql-testing"
+        name: "postgresql-persistent"
         ports:
         - containerPort: {{ .Values.config.port }}
           protocol: TCP

diff --git a/charts/redhat/postgresql-persistent/src/templates/tests/test-postgresql-connection.yaml b/charts/redhat/postgresql-persistent/src/templates/tests/test-postgresql-connection.yaml
@@ -24,8 +24,6 @@ spec:
           value: "{{ .Values.config.port }}"
       command:
         - /bin/bash
-        - -ec
+        - -exc
         - "PGPASSWORD=$PGPASSWORD /usr/bin/pg_isready -d $POSTGRESQL_DATABASE -h {{ .Values.database_service_name }} -p $POSTGRESQL_PORT -U $POSTGRESQL_USER"
-  lookupPolicy:
-    local: true
   restartPolicy: Never
diff --git a/charts/redhat/postgresql-persistent/src/values.yaml b/charts/redhat/postgresql-persistent/src/values.yaml
@@ -1,4 +1,4 @@
-database_service_name: postgresql-testing
+database_service_name: postgresql-persistent
 memory_limit: 512Mi
 namespace: postgresql-persistent-testing
 volume_capacity: 1Gi
@@ -8,4 +8,4 @@ config:
   postgresql_user: testu
   port: 5432
 image:
-  tag: "latest"
+  tag: "13-el8"
diff --git a/tests/test_postgresql_template.py b/tests/test_postgresql_template.py
@@ -19,11 +19,9 @@ def teardown_method(self):
         self.hc_api.delete_project()
 
     def test_package_persistent(self):
-        self.hc_api.set_version("0.0.1")
         self.hc_api.package_name = "postgresql-imagestreams"
         self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
-        self.hc_api.set_version("0.0.3")
         self.hc_api.package_name = "postgresql-persistent"
         self.hc_api.helm_package()
         assert self.hc_api.helm_installation(values={".image.tag": "13-el8", ".namespace": self.hc_api.namespace})