diff options
| author | Sami Hiltunen <shiltunen@gitlab.com> | 2020-12-09 13:11:24 +0300 |
|---|---|---|
| committer | Sami Hiltunen <shiltunen@gitlab.com> | 2020-12-09 13:11:24 +0300 |
| commit | 4a654f393f40a9c92c81e6b315139f06c8689008 (patch) | |
| tree | 071e2edd0940a9c4b2dbe38274f3d14b91e44f5c | |
| parent | c0ea152ccad891cda5fd255c1fea78562aae5e4a (diff) | |
| parent | 59cf521c4800b73ff93f80bdc4ca81fe2809c6e7 (diff) | |
Merge branch 'sh-fix-3way-squash-test-macs' into 'master'
Fix 3-way merge test failing on macOS
Closes #3349
See merge request gitlab-org/gitaly!2894
| -rw-r--r-- | internal/gitaly/service/operations/squash_test.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/internal/gitaly/service/operations/squash_test.go b/internal/gitaly/service/operations/squash_test.go index 15b483ec8..58d3a11ad 100644 --- a/internal/gitaly/service/operations/squash_test.go +++ b/internal/gitaly/service/operations/squash_test.go @@ -133,6 +133,10 @@ func TestSuccessfulUserSquashRequestWith3wayMerge(t *testing.T) { require.Equal(t, testhelper.TestUser.Email, commit.Committer.Email) require.Equal(t, commitMessage, commit.Subject) + // Handle symlinks in macOS from /tmp -> /private/tmp + testRepoPath, err = filepath.EvalSymlinks(testRepoPath) + require.NoError(t, err) + // Ensure Git metadata is cleaned up worktreeList := text.ChompBytes(testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "worktree", "list", "--porcelain")) expectedOut := fmt.Sprintf("worktree %s\nbare\n", testRepoPath) |