shell-agnostic tests

Anthony Landreth · Anthony Landreth · commit 31a3274e7ac1 · 2024-07-30T06:43:50.000-04:00
diff --git a/testing/kuttl/e2e/pgbackrest-init/06--check-spool-path.yaml b/testing/kuttl/e2e/pgbackrest-init/06--check-spool-path.yaml
@@ -13,4 +13,5 @@ commands:
       ls -l /pgdata
     )
 
-    [[ "$LIST" =~ "pgbackrest-spool" ]] || exit 1
+    contains() { bash -ceu '[[ "$1" == *"$2"* ]]' - "$@"; }
+    contains "$LIST" "pgbackrest-spool" || exit 1
diff --git a/testing/kuttl/e2e/wal-pvc-pgupgrade/06--check-spool-path.yaml b/testing/kuttl/e2e/wal-pvc-pgupgrade/06--check-spool-path.yaml
@@ -13,5 +13,7 @@ commands:
       ls -l /pgdata
     )
 
+    contains() { bash -ceu '[[ "$1" == *"$2"* ]]' - "$@"; }
+
     # Confirm that the pgbackrest spool-path has been symlinked to the wal volume.
-    [[ $LIST == *"pgbackrest-spool -> /pgwal/pgbackrest-spool"* ]] || exit 1
+    contains "$LIST" "pgbackrest-spool -> /pgwal/pgbackrest-spool" || exit 1

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,5 @@ commands:`
`13`	`13`	`ls -l /pgdata`
`14`	`14`	`)`
`15`	`15`
`16`		`- [[ "$LIST" =~ "pgbackrest-spool" ]] \|\| exit 1`
	`16`	`+ contains() { bash -ceu '[[ "$1" == "$2" ]]' - "$@"; }`
	`17`	`+ contains "$LIST" "pgbackrest-spool" \|\| exit 1`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,7 @@ commands:`
`13`	`13`	`ls -l /pgdata`
`14`	`14`	`)`
`15`	`15`
	`16`	`+ contains() { bash -ceu '[[ "$1" == "$2" ]]' - "$@"; }`
	`17`	`+`
`16`	`18`	`# Confirm that the pgbackrest spool-path has been symlinked to the wal volume.`
`17`		`- [[ $LIST == "pgbackrest-spool -> /pgwal/pgbackrest-spool" ]] \|\| exit 1`
	`19`	`+ contains "$LIST" "pgbackrest-spool -> /pgwal/pgbackrest-spool" \|\| exit 1`