fix(tests): fix flaky tests from updates

stavros-k · May 19, 2024 · 1de2444 · 1de2444
1 parent d1e75b0
commit 1de2444
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/library/common-test/tests/cnpg/cluster_recovery_spec_test.yaml b/library/common-test/tests/cnpg/cluster_recovery_spec_test.yaml
@@ -7,6 +7,10 @@ release:
 tests:
   - it: should generate correct spec with recovery/backup
     set:
+      postgres16Image:
+        repository: ghcr.io/cloudnative-pg/postgresql
+        tag: "16.3"
+        pullPolicy: IfNotPresent
       cnpg:
         my-pg:
           enabled: true
@@ -33,7 +37,7 @@ tests:
           path: spec
           value:
             enableSuperuserAccess: true
-            imageName: ghcr.io/cloudnative-pg/postgresql:16.2
+            imageName: ghcr.io/cloudnative-pg/postgresql:16.3
             primaryUpdateStrategy: unsupervised
             primaryUpdateMethod: switchover
             logLevel: info

diff --git a/library/common-test/tests/cnpg/cluster_spec_test.yaml b/library/common-test/tests/cnpg/cluster_spec_test.yaml
@@ -7,6 +7,10 @@ release:
 tests:
   - it: should generate correct spec
     set:
+      postgres16Image:
+        repository: ghcr.io/cloudnative-pg/postgresql
+        tag: "16.3"
+        pullPolicy: IfNotPresent
       cnpg:
         my-pg:
           enabled: true
@@ -29,7 +33,7 @@ tests:
           path: spec
           value:
             enableSuperuserAccess: true
-            imageName: ghcr.io/cloudnative-pg/postgresql:16.2
+            imageName: ghcr.io/cloudnative-pg/postgresql:16.3
             primaryUpdateStrategy: unsupervised
             primaryUpdateMethod: switchover
             logLevel: info

diff --git a/library/common-test/tests/volsync/replication_dest_spec_test.yaml b/library/common-test/tests/volsync/replication_dest_spec_test.yaml
@@ -37,6 +37,10 @@ tests:
       - documentIndex: *secretDoc
         isAPIVersion:
           of: v1
+      - documentIndex: *secretDoc
+        equal:
+          path: metadata.name
+          value: test-release-name-common-test-destbackup-volsync-mybackup1
       - documentIndex: *secretDoc
         equal:
           path: stringData

diff --git a/library/common/templates/class/volsync/_replicationDestination.tpl b/library/common/templates/class/volsync/_replicationDestination.tpl
@@ -29,7 +29,7 @@ apiVersion: volsync.backube/v1alpha1
 kind: ReplicationDestination
 metadata:
   name: {{ printf "%s-%s-dest" $objectData.name $volsyncData.name }}
-  namespace: {{ include "tc.v1.common.lib.metadata.namespace" (dict "rootCtx" $rootCtx "objectData" $objectData "caller" "replicationdestination") }}
+  namespace: {{ include "tc.v1.common.lib.metadata.namespace" (dict "rootCtx" $rootCtx "objectData" $objectData "caller" "Replication Destination") }}
   {{- $labels := (mustMerge ($volsyncData.labels | default dict) (include "tc.v1.common.lib.metadata.allLabels" $rootCtx | fromYaml)) -}}
   {{- with (include "tc.v1.common.lib.metadata.render" (dict "rootCtx" $rootCtx "labels" $labels) | trim) }}
   labels: