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/oauth_test.go

@@ -15,7 +15,7 @@ import (
 
 func TestCreateOAuthApp(t *testing.T) {
 	th := Setup().InitBasic().InitSystemAdmin()
-	defer TearDown()
+	defer th.TearDown()
 	Client := th.Client
 	AdminClient := th.SystemAdminClient
 
@@ -83,7 +83,7 @@ func TestCreateOAuthApp(t *testing.T) {
 
 func TestUpdateOAuthApp(t *testing.T) {
 	th := Setup().InitBasic().InitSystemAdmin()
-	defer TearDown()
+	defer th.TearDown()
 	Client := th.Client
 	AdminClient := th.SystemAdminClient
 
@@ -189,7 +189,7 @@ func TestUpdateOAuthApp(t *testing.T) {
 
 func TestGetOAuthApps(t *testing.T) {
 	th := Setup().InitBasic().InitSystemAdmin()
-	defer TearDown()
+	defer th.TearDown()
 	Client := th.Client
 	AdminClient := th.SystemAdminClient
 
@@ -262,7 +262,7 @@ func TestGetOAuthApps(t *testing.T) {
 
 func TestGetOAuthApp(t *testing.T) {
 	th := Setup().InitBasic().InitSystemAdmin()
-	defer TearDown()
+	defer th.TearDown()
 	Client := th.Client
 	AdminClient := th.SystemAdminClient
 
@@ -337,7 +337,7 @@ func TestGetOAuthApp(t *testing.T) {
 
 func TestGetOAuthAppInfo(t *testing.T) {
 	th := Setup().InitBasic().InitSystemAdmin()
-	defer TearDown()
+	defer th.TearDown()
 	Client := th.Client
 	AdminClient := th.SystemAdminClient
 
@@ -412,7 +412,7 @@ func TestGetOAuthAppInfo(t *testing.T) {
 
 func TestDeleteOAuthApp(t *testing.T) {
 	th := Setup().InitBasic().InitSystemAdmin()
-	defer TearDown()
+	defer th.TearDown()
 	Client := th.Client
 	AdminClient := th.SystemAdminClient
 
@@ -480,7 +480,7 @@ func TestDeleteOAuthApp(t *testing.T) {
 
 func TestRegenerateOAuthAppSecret(t *testing.T) {
 	th := Setup().InitBasic().InitSystemAdmin()
-	defer TearDown()
+	defer th.TearDown()
 	Client := th.Client
 	AdminClient := th.SystemAdminClient
 
@@ -552,7 +552,7 @@ func TestRegenerateOAuthAppSecret(t *testing.T) {
 
 func TestGetAuthorizedOAuthAppsForUser(t *testing.T) {
 	th := Setup().InitBasic().InitSystemAdmin()
-	defer TearDown()
+	defer th.TearDown()
 	Client := th.Client
 	AdminClient := th.SystemAdminClient
 
@@ -612,7 +612,7 @@ func TestGetAuthorizedOAuthAppsForUser(t *testing.T) {
 
 func TestAuthorizeOAuthApp(t *testing.T) {
 	th := Setup().InitBasic().InitSystemAdmin()
-	defer TearDown()
+	defer th.TearDown()
 	Client := th.Client
 	AdminClient := th.SystemAdminClient
 
@@ -680,7 +680,7 @@ func TestAuthorizeOAuthApp(t *testing.T) {
 
 func TestDeauthorizeOAuthApp(t *testing.T) {
 	th := Setup().InitBasic().InitSystemAdmin()
-	defer TearDown()
+	defer th.TearDown()
 	Client := th.Client
 	AdminClient := th.SystemAdminClient