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

1 files changed, 1 insertions, 10 deletions

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()
-}