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/websocket_test.go | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'api/websocket_test.go') diff --git a/api/websocket_test.go b/api/websocket_test.go index a5c512262..161ea4960 100644 --- a/api/websocket_test.go +++ b/api/websocket_test.go @@ -116,6 +116,8 @@ import ( func TestWebSocket(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() + WebSocketClient, err := th.CreateWebSocketClient() if err != nil { t.Fatal(err) @@ -177,6 +179,8 @@ func TestWebSocket(t *testing.T) { func TestWebSocketEvent(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() + WebSocketClient, err := th.CreateWebSocketClient() if err != nil { t.Fatal(err) @@ -252,6 +256,8 @@ func TestWebSocketEvent(t *testing.T) { func TestCreateDirectChannelWithSocket(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() + Client := th.BasicClient user2 := th.BasicUser2 @@ -314,7 +320,8 @@ func TestCreateDirectChannelWithSocket(t *testing.T) { } func TestWebsocketOriginSecurity(t *testing.T) { - Setup().InitBasic() + th := Setup().InitBasic() + defer th.TearDown() url := "ws://localhost" + *utils.Cfg.ServiceSettings.ListenAddress @@ -372,12 +379,3 @@ func TestWebsocketOriginSecurity(t *testing.T) { *utils.Cfg.ServiceSettings.AllowCorsFrom = "" } - -func TestZZWebSocketTearDown(t *testing.T) { - // *IMPORTANT* - Kind of hacky - // This should be the last function in any test file - // that calls Setup() - // Should be in the last file too sorted by name - time.Sleep(2 * time.Second) - TearDown() -} -- cgit v1.2.3-1-g7c22