From 3bfe9f9868f3186e411f0d44ee86d4f9a6a6ba8a Mon Sep 17 00:00:00 2001
From: Robert Oskamp <robert.oskamp@elastic.co>
Date: Tue, 3 Dec 2019 16:19:44 +0100
Subject: [PATCH] [7.5] [ML] Fix anomaly detection test suite (#51712) (#52050)

* [ML] Fix anomaly detection test suite (#51712)

This PR re-enables the anomaly detection test suite and disables Firefox test execution for now. It also increases stability for `clickEditDetector` and removes unneeded retries.

* Add retry for add detector as well
---
 .../anomaly_detection/index.ts                |  5 ++--
 .../machine_learning/job_management.ts        |  6 +----
 .../machine_learning/job_wizard_advanced.ts   | 26 +++++++++----------
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/index.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/index.ts
index 2b76bce544f6d..d5d617587fc3b 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/index.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/index.ts
@@ -6,8 +6,9 @@
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function({ loadTestFile }: FtrProviderContext) {
-  // FLAKY: https://github.com/elastic/kibana/issues/51669
-  describe.skip('anomaly detection', function() {
+  describe('anomaly detection', function() {
+    this.tags(['skipFirefox']);
+
     loadTestFile(require.resolve('./single_metric_job'));
     loadTestFile(require.resolve('./multi_metric_job'));
     loadTestFile(require.resolve('./population_job'));
diff --git a/x-pack/test/functional/services/machine_learning/job_management.ts b/x-pack/test/functional/services/machine_learning/job_management.ts
index ddab5fd68f13c..5ffb235a828d6 100644
--- a/x-pack/test/functional/services/machine_learning/job_management.ts
+++ b/x-pack/test/functional/services/machine_learning/job_management.ts
@@ -15,7 +15,6 @@ export function MachineLearningJobManagementProvider(
   mlApi: ProvidedType<typeof MachineLearningAPIProvider>
 ) {
   const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
 
   return {
     async navigateToNewJobSourceSelection() {
@@ -36,10 +35,7 @@ export function MachineLearningJobManagementProvider(
     },
 
     async assertStartDatafeedModalExists() {
-      // this retry can be removed as soon as #48734 is merged
-      await retry.tryForTime(5000, async () => {
-        await testSubjects.existOrFail('mlStartDatafeedModal');
-      });
+      await testSubjects.existOrFail('mlStartDatafeedModal', { timeout: 5000 });
     },
 
     async confirmStartDatafeedModal() {
diff --git a/x-pack/test/functional/services/machine_learning/job_wizard_advanced.ts b/x-pack/test/functional/services/machine_learning/job_wizard_advanced.ts
index 71b76a6885592..ec1c003653522 100644
--- a/x-pack/test/functional/services/machine_learning/job_wizard_advanced.ts
+++ b/x-pack/test/functional/services/machine_learning/job_wizard_advanced.ts
@@ -141,15 +141,14 @@ export function MachineLearningJobWizardAdvancedProvider({
     },
 
     async openCreateDetectorModal() {
-      await testSubjects.click('mlAddDetectorButton');
-      await this.assertCreateDetectorModalExists();
+      await retry.tryForTime(20 * 1000, async () => {
+        await testSubjects.click('mlAddDetectorButton');
+        await this.assertCreateDetectorModalExists();
+      });
     },
 
     async assertCreateDetectorModalExists() {
-      // this retry can be removed as soon as #48734 is merged
-      await retry.tryForTime(5000, async () => {
-        await testSubjects.existOrFail('mlCreateDetectorModal');
-      });
+      await testSubjects.existOrFail('mlCreateDetectorModal', { timeout: 5000 });
     },
 
     async assertDetectorFunctionInputExists() {
@@ -298,18 +297,17 @@ export function MachineLearningJobWizardAdvancedProvider({
     },
 
     async clickEditDetector(detectorIndex: number) {
-      await testSubjects.click(
-        `mlAdvancedDetector ${detectorIndex} > mlAdvancedDetectorEditButton`
-      );
-      await this.assertCreateDetectorModalExists();
+      await retry.tryForTime(20 * 1000, async () => {
+        await testSubjects.click(
+          `mlAdvancedDetector ${detectorIndex} > mlAdvancedDetectorEditButton`
+        );
+        await this.assertCreateDetectorModalExists();
+      });
     },
 
     async createJob() {
       await testSubjects.clickWhenNotDisabled('mlJobWizardButtonCreateJob');
-      // this retry can be removed as soon as #48734 is merged
-      await retry.tryForTime(5000, async () => {
-        await testSubjects.existOrFail('mlStartDatafeedModal');
-      });
+      await testSubjects.existOrFail('mlStartDatafeedModal', { timeout: 10 * 1000 });
     },
   };
 }