revert changes that don't pass

elastic · Aug 9, 2022 · 4c2e16c · 4c2e16c
1 parent 45e9642
commit 4c2e16c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/...ck/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/rbac_legacy.ts b/...ck/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/rbac_legacy.ts
@@ -10,7 +10,7 @@ import { SavedObjectsUtils } from '@kbn/core/server/saved_objects';
 import { UserAtSpaceScenarios, Superuser } from '../../../scenarios';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { ESTestIndexTool, getUrlPrefix, ObjectRemover, AlertUtils } from '../../../../common/lib';
-import { setupSpacesAndUsers, tearDown } from '../../../setup';
+import { setupSpacesAndUsers } from '../../../setup';
 
 // eslint-disable-next-line import/no-default-export
 export default function alertTests({ getService }: FtrProviderContext) {
@@ -71,7 +71,6 @@ export default function alertTests({ getService }: FtrProviderContext) {
       await esTestIndexTool.destroy();
       await es.indices.delete({ index: authorizationIndex });
       await esArchiver.unload('x-pack/test/functional/es_archives/alerts_legacy');
-      await tearDown(getService);
     });
 
     for (const scenario of UserAtSpaceScenarios) {

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/setup.ts b/x-pack/test/alerting_api_integration/security_and_spaces/setup.ts
@@ -39,7 +39,7 @@ export async function setupSpacesAndUsers(getService: FtrProviderContext['getSer
 
 export async function tearDown(getService: FtrProviderContext['getService']) {
   const securityService = getService('security');
-  const kibanaServer = getService('kibanaServer');
+  const esArchiver = getService('esArchiver');
 
   for (const user of Users) {
     await securityService.user.delete(user.username);
@@ -52,5 +52,5 @@ export async function tearDown(getService: FtrProviderContext['getService']) {
     }
   }
 
-  await kibanaServer.savedObjects.cleanStandardList();
+  await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
 }
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts
@@ -28,6 +28,6 @@ export async function buildUp(getService: FtrProviderContext['getService']) {
 }
 
 export async function tearDown(getService: FtrProviderContext['getService']) {
-  const kibanaServer = getService('kibanaServer');
-  await kibanaServer.savedObjects.cleanStandardList();
+  const esArchiver = getService('esArchiver');
+  await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
 }
diff --git a/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/index.ts b/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/index.ts
@@ -26,6 +26,6 @@ export async function buildUp(getService: FtrProviderContext['getService']) {
 }
 
 export async function tearDown(getService: FtrProviderContext['getService']) {
-  const kibanaServer = getService('kibanaServer');
-  await kibanaServer.savedObjects.cleanStandardList();
+  const esArchiver = getService('esArchiver');
+  await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
 }