Skip to content

Commit 2b546af

Browse files
committed
newGitBomb(): turn function into a test helper
1 parent 74f4c96 commit 2b546af

File tree

1 file changed

+13
-25
lines changed

1 file changed

+13
-25
lines changed

git_sizer_test.go

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ func addAuthorInfo(cmd *exec.Cmd, timestamp *time.Time) {
6262
}
6363

6464
func newGitBomb(
65-
repoName string, depth, breadth int, body string,
66-
) (repo *git.Repository, err error) {
65+
t *testing.T, repoName string, depth, breadth int, body string,
66+
) (repo *git.Repository) {
67+
t.Helper()
68+
6769
path, err := ioutil.TempDir("", repoName)
68-
if err != nil {
69-
return nil, err
70-
}
70+
require.NoError(t, err)
7171

7272
defer func() {
7373
if err != nil {
@@ -77,19 +77,16 @@ func newGitBomb(
7777

7878
cmd := exec.Command("git", "init", "--bare", path)
7979
err = cmd.Run()
80-
if err != nil {
81-
return nil, err
82-
}
80+
require.NoError(t, err)
8381

8482
repo, err = git.NewRepository(path)
85-
if err != nil {
86-
return nil, err
87-
}
83+
require.NoError(t, err)
8884

8985
oid, err := repo.CreateObject("blob", func(w io.Writer) error {
9086
_, err := io.WriteString(w, body)
9187
return err
9288
})
89+
require.NoError(t, err)
9390

9491
digits := len(fmt.Sprintf("%d", breadth-1))
9592

@@ -109,9 +106,7 @@ func newGitBomb(
109106
}
110107
return nil
111108
})
112-
if err != nil {
113-
return nil, err
114-
}
109+
require.NoError(t, err)
115110

116111
mode = "40000"
117112
prefix = "d"
@@ -129,16 +124,12 @@ func newGitBomb(
129124
)
130125
return err
131126
})
132-
if err != nil {
133-
return nil, err
134-
}
127+
require.NoError(t, err)
135128

136129
err = repo.UpdateRef("refs/heads/master", oid)
137-
if err != nil {
138-
return nil, err
139-
}
130+
require.NoError(t, err)
140131

141-
return repo, nil
132+
return repo
142133
}
143134

144135
func pow(x uint64, n int) uint64 {
@@ -153,10 +144,7 @@ func TestBomb(t *testing.T) {
153144
t.Parallel()
154145
assert := assert.New(t)
155146

156-
repo, err := newGitBomb("bomb", 10, 10, "boom!\n")
157-
if err != nil {
158-
t.Errorf("failed to create bomb: %s", err)
159-
}
147+
repo := newGitBomb(t, "bomb", 10, 10, "boom!\n")
160148
defer os.RemoveAll(repo.Path())
161149

162150
h, err := sizes.ScanRepositoryUsingGraph(

0 commit comments

Comments
 (0)