public/atlantis
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/atlantis.git synced 2026-08-04 07:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix a picky test that depends on git version

Browse Source
This commit is contained in:
Steve Mitchell
2019-09-18 22:54:06 -04:00
parent c19167cf53
commit 17bcd9d768
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/events/working_dir_test.go
View File

@@ -224,10 +224,13 @@ func TestClone_CheckoutMergeConflict(t *testing.T) {
HeadBranch: "branch",
BaseBranch: "master",
}, "default")
ErrEquals(t, `running git merge -q --no-ff -m atlantis-merge FETCH_HEAD: Auto-merging file
CONFLICT (add/add): Merge conflict in file
Automatic merge failed; fix conflicts and then commit the result.
: exit status 1`, err)
ErrContains(t, "running git merge -q --no-ff -m atlantis-merge FETCH_HEAD", err)
ErrContains(t, "Auto-merging file", err)
ErrContains(t, "CONFLICT (add/add)", err)
ErrContains(t, "Merge conflict in file", err)
ErrContains(t, "Automatic merge failed; fix conflicts and then commit the result.", err)
ErrContains(t, "exit status 1", err)
}
// Test that if the repo is already cloned and is at the right commit, we