From 81a69ed1050612dbec094cb3321f08acff677454 Mon Sep 17 00:00:00 2001 From: Jon Gjengset Date: Tue, 25 Nov 2014 19:58:50 -0500 Subject: [PATCH] Defer suite teardown to align with test teardown --- suite/suite.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/suite/suite.go b/suite/suite.go index 029723e..a0f0945 100644 --- a/suite/suite.go +++ b/suite/suite.go @@ -39,6 +39,11 @@ func Run(t *testing.T, suite TestingSuite) { if setupAllSuite, ok := suite.(SetupAllSuite); ok { setupAllSuite.SetupSuite() } + defer func() { + if tearDownAllSuite, ok := suite.(TearDownAllSuite); ok { + tearDownAllSuite.TearDownSuite() + } + }() methodFinder := reflect.TypeOf(suite) tests := []testing.InternalTest{} @@ -75,10 +80,6 @@ func Run(t *testing.T, suite TestingSuite) { tests) { t.Fail() } - - if tearDownAllSuite, ok := suite.(TearDownAllSuite); ok { - tearDownAllSuite.TearDownSuite() - } } // Filtering method according to set regular expression