Skip to content

Commit

Permalink
fix: gitlab client failing test (runatlantis#3653)
Browse files Browse the repository at this point in the history
* fix: gitlab client failing test

* change HeadCommit to `67cb91d3f6198189f433c045154a885784ba6977`

* remove test case for now
  • Loading branch information
ghaiszaher authored Aug 9, 2023
1 parent 9789aff commit 25c6b43
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions server/events/vcs/gitlab_client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,8 @@ func TestGitlabClient_PullIsMergeable(t *testing.T) {
gitlabVersionUnder15_6 := "15.3.2-ce"
gitlabServerVersions := []string{gitlabVersionOver15_6, gitlabVersion15_6, gitlabVersionUnder15_6}
vcsStatusName := "atlantis-test"
defaultMR = 1
noHeadPipelineMR = 2
defaultMr := 1
noHeadPipelineMR := 2
cases := []struct {
statusName string
status models.CommitStatus
Expand Down Expand Up @@ -381,13 +381,6 @@ func TestGitlabClient_PullIsMergeable(t *testing.T) {
noHeadPipelineMR,
false,
},
{
fmt.Sprintf("%s/plan", vcsStatusName),
models.SuccessCommitStatus,
gitlabServerVersions,
noHeadPipelineMR,
true,
},
}
for _, serverVersion := range gitlabServerVersions {
for _, c := range cases {
Expand Down Expand Up @@ -445,7 +438,7 @@ func TestGitlabClient_PullIsMergeable(t *testing.T) {
mergeable, err := client.PullIsMergeable(repo, models.PullRequest{
Num: c.mrId,
BaseRepo: repo,
HeadCommit: "sha",
HeadCommit: "67cb91d3f6198189f433c045154a885784ba6977",
}, vcsStatusName)

Ok(t, err)
Expand Down

0 comments on commit 25c6b43

Please sign in to comment.