diff options
| author | zeripath <art27@cantab.net> | 2019-11-25 23:21:37 +0000 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-11-26 01:21:37 +0200 |
| commit | 055f6d229672524e3933940f95aa28939d94961a (patch) | |
| tree | 72d1d427ce694517b70b6b751e35fdf6d5874428 /integrations/integration_test.go | |
| parent | f5bd0884d2adea8ef7ba1bbd9dacb240d7c6b0f7 (diff) | |
| download | gitea-055f6d229672524e3933940f95aa28939d94961a.tar.gz gitea-055f6d229672524e3933940f95aa28939d94961a.zip | |
Fix "data race" in testlogger (#9159)
* Fix data race in testlogger
* Update git_helper_for_declarative_test.go
Diffstat (limited to 'integrations/integration_test.go')
| -rw-r--r-- | integrations/integration_test.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/integrations/integration_test.go b/integrations/integration_test.go index 8d7f47dcfb..4177493930 100644 --- a/integrations/integration_test.go +++ b/integrations/integration_test.go @@ -173,19 +173,20 @@ func initIntegrationTest() { routers.GlobalInit() } -func prepareTestEnv(t testing.TB, skip ...int) { +func prepareTestEnv(t testing.TB, skip ...int) func() { t.Helper() ourSkip := 2 if len(skip) > 0 { ourSkip += skip[0] } - PrintCurrentTest(t, ourSkip) + deferFn := PrintCurrentTest(t, ourSkip) assert.NoError(t, models.LoadFixtures()) assert.NoError(t, os.RemoveAll(setting.RepoRootPath)) assert.NoError(t, os.RemoveAll(models.LocalCopyPath())) assert.NoError(t, com.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"), setting.RepoRootPath)) + return deferFn } type TestSession struct { |