Skip to content

Commit e1e4b3f

Browse files
committed
TestRepo.CreateObject(): reap the git hash-object command on errors
1 parent 46bc15c commit e1e4b3f

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

internal/testutils/repoutils.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"testing"
1313
"time"
1414

15+
"github.com/stretchr/testify/assert"
1516
"github.com/stretchr/testify/require"
1617

1718
"github.com/github/git-sizer/git"
@@ -182,13 +183,13 @@ func (repo *TestRepo) CreateObject(
182183

183184
err = writer(in)
184185
err2 := in.Close()
185-
if err != nil {
186-
cmd.Wait()
187-
require.NoError(t, err)
186+
if !assert.NoError(t, err) {
187+
_ = cmd.Wait()
188+
t.FailNow()
188189
}
189-
if err2 != nil {
190-
cmd.Wait()
191-
require.NoError(t, err2)
190+
if !assert.NoError(t, err2) {
191+
_ = cmd.Wait()
192+
t.FailNow()
192193
}
193194

194195
output, err := ioutil.ReadAll(out)

0 commit comments

Comments
 (0)