GOMODULES
/
testify
mirror of https://github.com/stretchr/testify.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Defer suite teardown to align with test teardown

pull/97/head
Jon Gjengset 2014-11-25 19:58:50 -05:00
parent 576f6382c0
commit 81a69ed105
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
suite/suite.go
View File

@ -39,6 +39,11 @@ func Run(t *testing.T, suite TestingSuite) {
if setupAllSuite, ok := suite.(SetupAllSuite); ok { if setupAllSuite, ok := suite.(SetupAllSuite); ok {
setupAllSuite.SetupSuite() setupAllSuite.SetupSuite()
} }
defer func() {
if tearDownAllSuite, ok := suite.(TearDownAllSuite); ok {
tearDownAllSuite.TearDownSuite()
}
}()
methodFinder := reflect.TypeOf(suite) methodFinder := reflect.TypeOf(suite)
tests := []testing.InternalTest{} tests := []testing.InternalTest{}
@ -75,10 +80,6 @@ func Run(t *testing.T, suite TestingSuite) {
tests) { tests) {
t.Fail() t.Fail()
} }
if tearDownAllSuite, ok := suite.(TearDownAllSuite); ok {
tearDownAllSuite.TearDownSuite()
}
} }
// Filtering method according to set regular expression // Filtering method according to set regular expression