Skip to content

Commit 6b20395

Browse files
committed
fix
1 parent 6999651 commit 6b20395

File tree

12 files changed

+10
-25
lines changed

12 files changed

+10
-25
lines changed

services/gitdiff/gitdiff_test.go

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package gitdiff
66

77
import (
8+
"context"
89
"strconv"
910
"strings"
1011
"testing"
@@ -628,23 +629,25 @@ func TestDiffLine_GetCommentSide(t *testing.T) {
628629
}
629630

630631
func TestGetDiffRangeWithWhitespaceBehavior(t *testing.T) {
631-
gitRepo, err := git.OpenRepository(git.DefaultContext, "./testdata/academic-module")
632+
gitRepo, err := git.OpenRepository(context.Background(), "../../modules/git/tests/repos/repo5_pulls")
632633
require.NoError(t, err)
633634

634635
defer gitRepo.Close()
635636
for _, behavior := range []git.TrustedCmdArgs{{"-w"}, {"--ignore-space-at-eol"}, {"-b"}, nil} {
636-
diffs, err := GetDiff(db.DefaultContext, gitRepo,
637+
diffs, err := GetDiff(context.Background(), gitRepo,
637638
&DiffOptions{
638-
AfterCommitID: "bd7063cc7c04689c4d082183d32a604ed27a24f9",
639-
BeforeCommitID: "559c156f8e0178b71cb44355428f24001b08fc68",
639+
AfterCommitID: "d8e0bbb45f200e67d9a784ce55bd90821af45ebd",
640+
BeforeCommitID: "72866af952e98d02a73003501836074b286a78f6",
640641
MaxLines: setting.Git.MaxGitDiffLines,
641642
MaxLineCharacters: setting.Git.MaxGitDiffLineCharacters,
642-
MaxFiles: setting.Git.MaxGitDiffFiles,
643+
MaxFiles: 1,
643644
WhitespaceBehavior: behavior,
644645
})
645-
assert.NoError(t, err, "Error when diff with %s", behavior)
646+
require.NoError(t, err, "Error when diff with WhitespaceBehavior=%s", behavior)
647+
assert.True(t, diffs.IsIncomplete)
648+
assert.Len(t, diffs.Files, 1)
646649
for _, f := range diffs.Files {
647-
assert.NotEmpty(t, f.Sections, "%s should have sections", f.Name)
650+
assert.NotEmpty(t, f.Sections, "Diff file %q should have sections", f.Name)
648651
}
649652
}
650653
}

services/gitdiff/testdata/academic-module/HEAD

Lines changed: 0 additions & 1 deletion
This file was deleted.

services/gitdiff/testdata/academic-module/config

Lines changed: 0 additions & 10 deletions
This file was deleted.
-45.9 KB
Binary file not shown.

services/gitdiff/testdata/academic-module/logs/HEAD

Lines changed: 0 additions & 1 deletion
This file was deleted.

services/gitdiff/testdata/academic-module/logs/refs/heads/master

Lines changed: 0 additions & 1 deletion
This file was deleted.

services/gitdiff/testdata/academic-module/logs/refs/remotes/origin/HEAD

Lines changed: 0 additions & 1 deletion
This file was deleted.

services/gitdiff/testdata/academic-module/packed-refs

Lines changed: 0 additions & 2 deletions
This file was deleted.

services/gitdiff/testdata/academic-module/refs/heads/master

Lines changed: 0 additions & 1 deletion
This file was deleted.

services/gitdiff/testdata/academic-module/refs/remotes/origin/HEAD

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)