Check for workflow id more specifically in tests

cbandy · cbandy · commit 41350e5bd09a · 2020-04-29T20:37:17.000-05:00
More than just the workflow id is printed now.
diff --git a/testing/pgo_cli/cluster_create_test.go b/testing/pgo_cli/cluster_create_test.go
@@ -17,7 +17,6 @@ package pgo_cli_test
 
 import (
 	"regexp"
-	"strings"
 	"testing"
 	"time"
 
@@ -31,15 +30,14 @@ func TestClusterCreate(t *testing.T) {
 	withNamespace(t, func(namespace func() string) {
 		t.Run("create cluster", func(t *testing.T) {
 			t.Run("creates a workflow", func(t *testing.T) {
+				workflow := regexp.MustCompile(`(?m:^workflow id.*?(\S+)$)`)
+
 				output, err := pgo("create", "cluster", "mycluster", "-n", namespace()).Exec(t)
 				defer teardownCluster(t, namespace(), "mycluster", time.Now())
 				require.NoError(t, err)
-				require.Contains(t, output, "workflow id")
-
-				workflow := regexp.MustCompile(`\S+$`).FindString(strings.TrimSpace(output))
-				require.NotEmpty(t, workflow)
+				require.Regexp(t, workflow, output, "expected pgo to show the workflow")
 
-				_, err = pgo("show", "workflow", workflow, "-n", namespace()).Exec(t)
+				_, err = pgo("show", "workflow", workflow.FindStringSubmatch(output)[1], "-n", namespace()).Exec(t)
 				require.NoError(t, err)
 			})
 		})
