From 9bc7af0c5704bbf73f8240b4569d5ea215352e39 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 2 Oct 2017 03:50:56 -0500 Subject: Don't use global app for api / api4 tests (#7528) * don't use global app for api / api4 tests * put sleep back. we're gonna have to do some goroutine wrangling * fix oauth test config assumptions * jobs package, i'm comin' for you next * app test fix * try increasing sleep a little --- api/file_test.go | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'api/file_test.go') diff --git a/api/file_test.go b/api/file_test.go index 02a0c0cfd..6d6338395 100644 --- a/api/file_test.go +++ b/api/file_test.go @@ -25,6 +25,7 @@ import ( func TestUploadFile(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() if *utils.Cfg.FileSettings.DriverName == "" { t.Logf("skipping because no file driver is enabled") @@ -124,6 +125,7 @@ func TestUploadFile(t *testing.T) { func TestGetFileInfo(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() if *utils.Cfg.FileSettings.DriverName == "" { t.Skip("skipping because no file driver is enabled") @@ -193,6 +195,7 @@ func TestGetFileInfo(t *testing.T) { func TestGetFile(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() if *utils.Cfg.FileSettings.DriverName == "" { t.Skip("skipping because no file driver is enabled") @@ -275,6 +278,7 @@ func TestGetFile(t *testing.T) { func TestGetFileThumbnail(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() if *utils.Cfg.FileSettings.DriverName == "" { t.Skip("skipping because no file driver is enabled") @@ -331,6 +335,7 @@ func TestGetFileThumbnail(t *testing.T) { func TestGetFilePreview(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() if *utils.Cfg.FileSettings.DriverName == "" { t.Skip("skipping because no file driver is enabled") @@ -387,6 +392,7 @@ func TestGetFilePreview(t *testing.T) { func TestGetPublicFile(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() if *utils.Cfg.FileSettings.DriverName == "" { t.Skip("skipping because no file driver is enabled") @@ -454,6 +460,7 @@ func TestGetPublicFile(t *testing.T) { func TestGetPublicFileOld(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() if *utils.Cfg.FileSettings.DriverName == "" { t.Skip("skipping because no file driver is enabled") @@ -538,6 +545,7 @@ func generatePublicLinkOld(siteURL, teamId, channelId, userId, filename string) func TestGetPublicLink(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() if *utils.Cfg.FileSettings.DriverName == "" { t.Skip("skipping because no file driver is enabled") @@ -607,6 +615,7 @@ func TestGetPublicLink(t *testing.T) { func TestMigrateFilenamesToFileInfos(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() if *utils.Cfg.FileSettings.DriverName == "" { t.Skip("skipping because no file driver is enabled") @@ -719,6 +728,7 @@ func uploadFileOld(t *testing.T, data []byte, dest string, filename string) { func TestFindTeamIdForFilename(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() if *utils.Cfg.FileSettings.DriverName == "" { t.Skip("skipping because no file driver is enabled") @@ -785,6 +795,7 @@ func TestFindTeamIdForFilename(t *testing.T) { func TestGetInfoForFilename(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() if *utils.Cfg.FileSettings.DriverName == "" { t.Skip("skipping because no file driver is enabled") -- cgit v1.2.3-1-g7c22