Fix tests

Author: maggie-lou

enterprise/server/test/integration/workflow/workflow_test.go

@@ -45,7 +45,7 @@ const (
 )
 
 // simpleRepo simulates a test repo with the config files required to run a workflow
-func simpleRepo() map[string]string {
+func simpleRepo(useCLI bool) map[string]string {
 	return map[string]string{
 		"BUILD": `
 sh_binary(
@@ -57,6 +57,7 @@ sh_binary(
 		"buildbuddy.yaml": `
 actions:
   - name: "Test action"
+    use_cli: ` + strconv.FormatBool(useCLI) + `
     triggers: { push: { branches: [ master ] } }
     bazel_commands: [ "build //:nop" ]
     os: ` + runtime.GOOS + `
@@ -80,6 +81,7 @@ sh_binary(
 		"buildbuddy.yaml": `
 actions:
   - name: "Slow test action"
+    use_cli: false
     triggers: { push: { branches: [ master ] } }
     bazel_commands: [ "run //:sleep_forever_test" ]
     os: ` + runtime.GOOS + `
@@ -278,38 +280,42 @@ func actionCount(t *testing.T, inv *inpb.Invocation) int {
 }
 
 func TestTriggerViaWebhook(t *testing.T) {
-	fakeGitProvider := testgit.NewFakeProvider()
-	env, workflowService := setup(t, fakeGitProvider)
-	bb := env.GetBuildBuddyServiceClient()
-
-	repoContentsMap := simpleRepo()
-	repoPath, commitSHA := makeRepo(t, repoContentsMap)
-	repoURL := fmt.Sprintf("file://%s", repoPath)
-
-	ctx := env.WithUserID(context.Background(), env.UserID1)
-	reqCtx := &ctxpb.RequestContext{
-		UserId:  &uidpb.UserId{Id: env.UserID1},
-		GroupId: env.GroupID1,
-	}
-	repo := createWorkflow(t, env, repoURL)
+	for _, useCLI := range []bool{false} {
+		t.Run(fmt.Sprintf("use_cli=%t", useCLI), func(t *testing.T) {
+			fakeGitProvider := testgit.NewFakeProvider()
+			env, workflowService := setup(t, fakeGitProvider)
+			bb := env.GetBuildBuddyServiceClient()
+
+			repoContentsMap := simpleRepo(useCLI)
+			repoPath, commitSHA := makeRepo(t, repoContentsMap)
+			repoURL := fmt.Sprintf("file://%s", repoPath)
+
+			ctx := env.WithUserID(context.Background(), env.UserID1)
+			reqCtx := &ctxpb.RequestContext{
+				UserId:  &uidpb.UserId{Id: env.UserID1},
+				GroupId: env.GroupID1,
+			}
+			repo := createWorkflow(t, env, repoURL)
 
-	triggerWebhook(t, ctx, fakeGitProvider, workflowService, repo, repoContentsMap, repoURL, commitSHA)
+			triggerWebhook(t, ctx, fakeGitProvider, workflowService, repo, repoContentsMap, repoURL, commitSHA)
 
-	iid := waitForAnyWorkflowInvocationCreated(t, ctx, bb, reqCtx)
-	inv := waitForInvocationStatus(t, ctx, bb, reqCtx, iid, inspb.InvocationStatus_COMPLETE_INVOCATION_STATUS)
+			iid := waitForAnyWorkflowInvocationCreated(t, ctx, bb, reqCtx)
+			inv := waitForInvocationStatus(t, ctx, bb, reqCtx, iid, inspb.InvocationStatus_COMPLETE_INVOCATION_STATUS)
 
-	require.True(t, inv.GetSuccess(), "workflow invocation should succeed")
-	require.Equal(t, repoURL, inv.GetRepoUrl())
-	require.Equal(t, commitSHA, inv.GetCommitSha())
-	require.Equal(t, "CI_RUNNER", inv.GetRole())
+			require.True(t, inv.GetSuccess(), "workflow invocation should succeed")
+			require.Equal(t, repoURL, inv.GetRepoUrl())
+			require.Equal(t, commitSHA, inv.GetCommitSha())
+			require.Equal(t, "CI_RUNNER", inv.GetRole())
+		})
+	}
 }
 
 func TestTriggerLegacyWorkflowViaWebhook(t *testing.T) {
 	fakeGitProvider := testgit.NewFakeProvider()
 	env, workflowService := setup(t, fakeGitProvider)
 	bb := env.GetBuildBuddyServiceClient()
 
-	repoContentsMap := simpleRepo()
+	repoContentsMap := simpleRepo(false)
 	repoPath, commitSHA := makeRepo(t, repoContentsMap)
 	repoURL := fmt.Sprintf("file://%s", repoPath)
 
@@ -345,11 +351,11 @@ func TestTriggerLegacyWorkflowViaWebhook(t *testing.T) {
 
 func TestExecuteWorkflow(t *testing.T) {
 	fakeGitProvider := testgit.NewFakeProvider()
-	fakeGitProvider.FileContents = simpleRepo()
+	fakeGitProvider.FileContents = simpleRepo(false /*useCLI*/)
 	env, wfService := setup(t, fakeGitProvider)
 	bb := env.GetBuildBuddyServiceClient()
 
-	repoPath, commitSHA := makeRepo(t, simpleRepo())
+	repoPath, commitSHA := makeRepo(t, simpleRepo(false /*useCLI*/))
 	repoURL := fmt.Sprintf("file://%s", repoPath)
 	ctx := env.WithUserID(context.Background(), env.UserID1)
 	reqCtx := &ctxpb.RequestContext{