diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-10-16 12:01:34 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-10-16 12:01:34 +0300 |
| commit | ffa448ebc12708c5eabc3932407eee4bd27ba7fb (patch) | |
| tree | f219ec00f3f06480b99bce94193ae52e2c0dee25 | |
| parent | fe716289d7ab396ea8a7675233983dac9477ac06 (diff) | |
git2go: Fix semantic conflict in error message
The gitaly-git2go revert tests explicitly check for matching errors. One
of those errors which is raised in case looking up a commit has failed
has recently been reworded for increased clarity in commit 831cb439
(git2go: Improve error messages when looking up commits, 2020-10-12).
Due to both merge requests crossing, those testcases now fail.
Fix the issue by adjusting expected error messages.
| -rw-r--r-- | cmd/gitaly-git2go/revert_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/gitaly-git2go/revert_test.go b/cmd/gitaly-git2go/revert_test.go index d624f5784..6c62b9f93 100644 --- a/cmd/gitaly-git2go/revert_test.go +++ b/cmd/gitaly-git2go/revert_test.go @@ -132,7 +132,7 @@ func TestRevert_trees(t *testing.T) { return "nonexistent", revertOid.String() }, - expectedStderr: "revert: ours commit lookup: could not lookup reference: revspec 'nonexistent' not found\n", + expectedStderr: "revert: ours commit lookup: could not lookup reference \"nonexistent\": revspec 'nonexistent' not found\n", }, { desc: "nonexistent revert fails", @@ -143,7 +143,7 @@ func TestRevert_trees(t *testing.T) { return oursOid.String(), "nonexistent" }, - expectedStderr: "revert: revert commit lookup: could not lookup reference: revspec 'nonexistent' not found\n", + expectedStderr: "revert: revert commit lookup: could not lookup reference \"nonexistent\": revspec 'nonexistent' not found\n", }, } for _, tc := range testcases { |