From edb426f5c19d19cf8b26811e3e9d39e4f7cf7147 Mon Sep 17 00:00:00 2001
From: Melissa Alvarez <melissa.alvarez@elastic.co>
Date: Tue, 14 Jul 2020 16:57:10 -0400
Subject: [PATCH] re-enable tests. retry on fail

---
 .../components/configuration_step/analysis_fields_table.tsx | 1 +
 .../test/functional/apps/ml/data_frame_analytics/index.ts   | 3 +--
 .../functional/services/ml/data_frame_analytics_creation.ts | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/analysis_fields_table.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/analysis_fields_table.tsx
index ff8797bc523c1..a229a79d316d7 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/analysis_fields_table.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/analysis_fields_table.tsx
@@ -172,6 +172,7 @@ export const AnalysisFieldsTable: FC<{
   return (
     <Fragment>
       <EuiFormRow
+        data-test-subj="mlAnalyticsCreateJobWizardIncludesTable"
         label={i18n.translate('xpack.ml.dataframe.analytics.create.includedFieldsLabel', {
           defaultMessage: 'Included fields',
         })}
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/index.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/index.ts
index a2ac236a5ea27..0202c8431ce34 100644
--- a/x-pack/test/functional/apps/ml/data_frame_analytics/index.ts
+++ b/x-pack/test/functional/apps/ml/data_frame_analytics/index.ts
@@ -6,8 +6,7 @@
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
-  // flaky tests
-  describe.skip('data frame analytics', function () {
+  describe('data frame analytics', function () {
     this.tags(['mlqa', 'skipFirefox']);
 
     loadTestFile(require.resolve('./outlier_detection_creation'));
diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
index fc4aaa4fbf5fd..e36855a4e769e 100644
--- a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
+++ b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
@@ -181,7 +181,11 @@ export function MachineLearningDataFrameAnalyticsCreationProvider(
     },
 
     async assertIncludeFieldsSelectionExists() {
-      await testSubjects.existOrFail('mlAnalyticsCreateJobWizardIncludesSelect', { timeout: 5000 });
+      await testSubjects.existOrFail('mlAnalyticsCreateJobWizardIncludesTable', { timeout: 8000 });
+
+      await retry.tryForTime(8000, async () => {
+        await testSubjects.existOrFail('mlAnalyticsCreateJobWizardIncludesSelect');
+      });
     },
 
     // async assertIncludedFieldsSelection(expectedSelection: string[]) {