Make sure we test for Pending Approval

When the user is not allowed make sure we check the test are in Pending Approval
openshift-pipelines · Jun 23, 2023 · 688e38d · 688e38d
1 parent 8e4eb7f
commit 688e38d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/test/gitea_access_control_test.go b/test/gitea_access_control_test.go
@@ -198,7 +198,7 @@ func TestGiteaACLOrgPendingApproval(t *testing.T) {
 	assert.NilError(t, err)
 
 	topts.PullRequest = tgitea.CreateForkPullRequest(t, topts, secondcnx, "", "echo Hello from user "+topts.TargetRefName)
-	topts.CheckForStatus = "pending"
+	topts.CheckForStatus = "Skipped"
 	tgitea.WaitForStatus(t, topts, topts.PullRequest.Head.Sha, "", false)
 	topts.Regexp = regexp.MustCompile(`.*is skipping this commit.*`)
 	tgitea.WaitForPullRequestCommentMatch(t, topts)
@@ -236,7 +236,7 @@ func TestGiteaACLCommentsAllowing(t *testing.T) {
 			assert.NilError(t, err)
 
 			topts.PullRequest = tgitea.CreateForkPullRequest(t, topts, secondcnx, "", "echo Hello from user "+topts.TargetRefName)
-			topts.CheckForStatus = "pending"
+			topts.CheckForStatus = "Skipped"
 			tgitea.WaitForStatus(t, topts, topts.PullRequest.Head.Sha, "", false)
 			topts.Regexp = regexp.MustCompile(`.*is skipping this commit.*`)
 			tgitea.WaitForPullRequestCommentMatch(t, topts)

diff --git a/test/gitea_test.go b/test/gitea_test.go
@@ -654,6 +654,7 @@ func TestGiteaParamsOnRepoCRWithCustomConsole(t *testing.T) {
 				Value: "myconsole",
 			},
 		},
+		StatusOnlyLatest: true,
 	}
 	topts.TargetRefName = names.SimpleNameGenerator.RestrictLengthWithRandomSuffix("pac-e2e-test")
 	topts.TargetNS = topts.TargetRefName

diff --git a/test/pkg/gitea/test.go b/test/pkg/gitea/test.go
@@ -27,6 +27,7 @@ import (
 )
 
 type TestOpts struct {
+	StatusOnlyLatest      bool
 	OnOrg                 bool
 	NoPullRequestCreation bool
 	SkipEventsCheck       bool
@@ -139,7 +140,7 @@ func TestPR(t *testing.T, topts *TestOpts) func() {
 	topts.ParamsRun.Clients.Log.Infof("PullRequest %s has been created", pr.HTMLURL)
 
 	if topts.CheckForStatus != "" {
-		WaitForStatus(t, topts, topts.TargetRefName, "", false)
+		WaitForStatus(t, topts, topts.TargetRefName, "", topts.StatusOnlyLatest)
 	}
 
 	if topts.Regexp != nil {
@@ -195,16 +196,32 @@ func WaitForStatus(t *testing.T, topts *TestOpts, ref, forcontext string, onlyla
 			return statuses[i].ID < statuses[j].ID
 		})
 		if onlylatest {
-			statuses = statuses[len(statuses)-1:]
+			if len(statuses) > 1 {
+				statuses = statuses[len(statuses)-1:]
+			} else {
+				time.Sleep(5 * time.Second)
+				continue
+			}
 		}
 		for _, cstatus := range statuses {
+			if topts.CheckForStatus == "Skipped" {
+				if strings.HasSuffix(cstatus.Description, "Pending approval") {
+					numstatus++
+					break
+				}
+			}
 			if cstatus.State == "pending" {
 				continue
 			}
 			if forcontext != "" && cstatus.Context != forcontext {
 				continue
 			}
-			assert.Equal(t, string(cstatus.State), topts.CheckForStatus)
+			statuscheck := topts.CheckForStatus
+			if statuscheck != "" && statuscheck != string(cstatus.State) {
+				if statuscheck != cstatus.Description {
+					t.Errorf("Status on SHA: %s is %s from %s", ref, cstatus.State, cstatus.Context)
+				}
+			}
 			topts.ParamsRun.Clients.Log.Infof("Status on SHA: %s is %s from %s", ref, cstatus.State, cstatus.Context)
 			numstatus++
 		}