From 1a75b4558ba661fe630079db9b9b32148a27d415 Mon Sep 17 00:00:00 2001 From: Yusuke Kuoka Date: Wed, 15 Sep 2021 00:23:16 +0000 Subject: [PATCH] Fix E2E test to actualy pass I have a dedicated GitHub organization and a private repository to run this E2E test. After a few fixes included in this change, it has successfully passed. --- test/e2e/e2e_test.go | 4 ++-- testing/git.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 8a1992ac..de9e9bc0 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -298,7 +298,7 @@ func installActionsWorkflow(t *testing.T, testID, runnerLabel, testResultCMNameP Name: wfName, On: testing.On{ Push: &testing.Push{ - Branches: []string{"main"}, + Branches: []string{"master"}, }, }, Jobs: map[string]testing.Job{}, @@ -403,5 +403,5 @@ func verifyActionsWorkflowRun(t *testing.T, env *testing.Env, testJobs []job) { } return results, err - }, 60*time.Second, 10*time.Second).Should(gomega.Equal(expected)) + }, 3*60*time.Second, 10*time.Second).Should(gomega.Equal(expected)) } diff --git a/testing/git.go b/testing/git.go index 97b64113..110cbe9e 100644 --- a/testing/git.go +++ b/testing/git.go @@ -89,7 +89,7 @@ func (g *GitRepo) gitCommitCmd(ctx context.Context, dir, msg string) *exec.Cmd { } func (g *GitRepo) gitPushCmd(ctx context.Context, dir string) *exec.Cmd { - cmd := exec.CommandContext(ctx, "git", "push", "origin", "main") + cmd := exec.CommandContext(ctx, "git", "push", "origin", "master") cmd.Dir = dir return cmd }