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 --- api4/websocket_test.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'api4/websocket_test.go') diff --git a/api4/websocket_test.go b/api4/websocket_test.go index f07e09b55..fa40629dc 100644 --- a/api4/websocket_test.go +++ b/api4/websocket_test.go @@ -12,7 +12,7 @@ import ( func TestWebSocket(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() WebSocketClient, err := th.CreateWebSocketClient() if err != nil { t.Fatal(err) @@ -71,12 +71,3 @@ func TestWebSocket(t *testing.T) { } } } - -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) - StopServer() -} -- cgit v1.2.3-1-g7c22