Move requireStanzaExists to test suite helper

Multiple tests had similar implementations.

Author: cbandy

testing/pgo_cli/cluster_backup_test.go

@@ -30,20 +30,6 @@ import (
 func TestClusterBackup(t *testing.T) {
 	t.Parallel()
 
-	requireStanzaExists := func(t *testing.T, namespace, cluster string, timeout time.Duration) {
-		t.Helper()
-
-		ready := func() bool {
-			output, err := pgo("show", "backup", cluster, "-n", namespace).Exec(t)
-			return err == nil && strings.Contains(output, "status: ok")
-		}
-
-		if !ready() {
-			requireWaitFor(t, ready, timeout, time.Second,
-				"timeout waiting for stanza of %q in %q", cluster, namespace)
-		}
-	}
-
 	withNamespace(t, func(namespace func() string) {
 		withCluster(t, namespace, func(cluster func() string) {
 			t.Run("show backup", func(t *testing.T) {

testing/pgo_cli/cluster_clone_test.go

@@ -16,7 +16,6 @@ package pgo_cli_test
 */
 
 import (
-	"strings"
 	"testing"
 	"time"
 
@@ -26,21 +25,6 @@ import (
 func TestClusterClone(t *testing.T) {
 	t.Parallel()
 
-	requireStanzaExists := func(t *testing.T, namespace, cluster string, timeout time.Duration) {
-		t.Helper()
-
-		ready := func() bool {
-			output, err := pgo("show", "backup", cluster, "-n", namespace).Exec(t)
-			require.NoError(t, err)
-			return strings.Contains(output, "status: ok")
-		}
-
-		if !ready() {
-			requireWaitFor(t, ready, timeout, time.Second,
-				"timeout waiting for stanza of %q in %q", cluster, namespace)
-		}
-	}
-
 	withNamespace(t, func(namespace func() string) {
 		withCluster(t, namespace, func(cluster func() string) {
 			t.Run("clone", func(t *testing.T) {

testing/pgo_cli/suite_helpers_test.go

@@ -235,6 +235,25 @@ func requireReplicasReady(t testing.TB, namespace, cluster string, timeout time.
 	}
 }
 
+// requireStanzaExists waits until pgBackRest reports the stanza is ok. If
+// timeout elapses, t will FailNow.
+func requireStanzaExists(t testing.TB, namespace, cluster string, timeout time.Duration) {
+	t.Helper()
+
+	var err error
+	var output string
+
+	ready := func() bool {
+		output, err = pgo("show", "backup", cluster, "-n", namespace).Exec(t)
+		return err == nil && strings.Contains(output, "status: ok")
+	}
+
+	if !ready() {
+		requireWaitFor(t, ready, timeout, time.Second,
+			"timeout waiting for stanza of %q in %q:\n%s", cluster, namespace, output)
+	}
+}
+
 // requireWaitFor calls condition every tick until it returns true. If timeout
 // elapses, t will Logf message and args then FailNow. Condition runs in the
 // current goroutine so that it may also call t.FailNow.