From 3f32b56192aa16784172643050743c5e54bc02f7 Mon Sep 17 00:00:00 2001
From: MadameSheema <snootchie.boochies@gmail.com>
Date: Tue, 8 Dec 2020 20:46:56 +0100
Subject: [PATCH] [SIEM] unblocks master failures (#85319)

---
 .../security_solution/cypress/integration/alerts.spec.ts    | 6 +++---
 .../cypress/integration/alerts_detection_exceptions.spec.ts | 2 +-
 .../integration/alerts_detection_rules_custom.spec.ts       | 2 +-
 .../integration/alerts_detection_rules_export.spec.ts       | 2 +-
 .../alerts_detection_rules_indicator_match.spec.ts          | 2 +-
 .../cypress/integration/alerts_detection_rules_ml.spec.ts   | 2 ++
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts.spec.ts
index 04b3f6f13eca..26b803d14423 100644
--- a/x-pack/plugins/security_solution/cypress/integration/alerts.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts.spec.ts
@@ -39,8 +39,8 @@ describe('Alerts', () => {
     });
 
     afterEach(() => {
-      removeSignalsIndex();
       esArchiverUnload('alerts');
+      removeSignalsIndex();
     });
 
     it('Closes and opens alerts', () => {
@@ -169,8 +169,8 @@ describe('Alerts', () => {
     });
 
     afterEach(() => {
-      removeSignalsIndex();
       esArchiverUnload('closed_alerts');
+      removeSignalsIndex();
     });
 
     it('Open one alert when more than one closed alerts are selected', () => {
@@ -221,8 +221,8 @@ describe('Alerts', () => {
     });
 
     afterEach(() => {
-      removeSignalsIndex();
       esArchiverUnload('alerts');
+      removeSignalsIndex();
     });
 
     it('Mark one alert in progress when more than one open alerts are selected', () => {
diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_exceptions.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_exceptions.spec.ts
index 160dbad9a06b..d4b5a7401495 100644
--- a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_exceptions.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_exceptions.spec.ts
@@ -66,8 +66,8 @@ describe('Exceptions', () => {
   afterEach(() => {
     esArchiverUnload('auditbeat_for_exceptions');
     esArchiverUnload('auditbeat_for_exceptions2');
-    removeSignalsIndex();
     deleteCustomRule();
+    removeSignalsIndex();
   });
   context('From rule', () => {
     it('Creates an exception and deletes it', () => {
diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts
index 2776a4472bb6..4eca2f6d326a 100644
--- a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts
@@ -120,8 +120,8 @@ describe('Custom detection rules creation', () => {
 
   after(() => {
     deleteRule();
-    removeSignalsIndex();
     esArchiverUnload('timeline');
+    removeSignalsIndex();
   });
 
   it('Creates and activates a new rule', () => {
diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_export.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_export.spec.ts
index d6b347b1112e..e440228ebd13 100644
--- a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_export.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_export.spec.ts
@@ -28,8 +28,8 @@ describe('Export rules', () => {
   });
 
   after(() => {
-    removeSignalsIndex();
     esArchiverUnload('export_rule');
+    removeSignalsIndex();
   });
 
   it('Exports a custom rule', () => {
diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_indicator_match.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_indicator_match.spec.ts
index 193d5939d04a..e30ee5126f1e 100644
--- a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_indicator_match.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_indicator_match.spec.ts
@@ -97,8 +97,8 @@ describe('Detection rules, Indicator Match', () => {
   afterEach(() => {
     esArchiverUnload('threat_indicator');
     esArchiverUnload('threat_data');
-    removeSignalsIndex();
     deleteRule();
+    removeSignalsIndex();
   });
 
   it('Creates and activates a new Indicator Match rule', () => {
diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_ml.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_ml.spec.ts
index 9669b4ed4c78..66fd34c03803 100644
--- a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_ml.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_ml.spec.ts
@@ -53,6 +53,7 @@ import {
   waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded,
   waitForRulesToBeLoaded,
 } from '../tasks/alerts_detection_rules';
+import { removeSignalsIndex } from '../tasks/api_calls';
 import {
   createAndActivateRule,
   fillAboutRuleAndContinue,
@@ -79,6 +80,7 @@ describe('Detection rules, machine learning', () => {
   after(() => {
     deleteRule();
     esArchiverUnload('prebuilt_rules_loaded');
+    removeSignalsIndex();
   });
 
   it('Creates and activates a new ml rule', () => {