[ML] Functional tests - increase stability of source selection (elast…

…ic#51988) This PR adds a retry to the ML source selection service method for functional tests.
pmuellr · Dec 3, 2019 · 0ac7d53 · 0ac7d53
1 parent 36e7bc3
commit 0ac7d53
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/advanced_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/advanced_job.ts
@@ -297,7 +297,7 @@ export default function({ getService }: FtrProviderContext) {
         });
 
         it('job creation loads the job type selection page', async () => {
-          await ml.jobSourceSelection.selectSource(testData.jobSource);
+          await ml.jobSourceSelection.selectSourceForAnomalyDetectionJob(testData.jobSource);
         });
 
         it('job creation loads the advanced job wizard page', async () => {

diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/multi_metric_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/multi_metric_job.ts
@@ -92,7 +92,7 @@ export default function({ getService }: FtrProviderContext) {
     });
 
     it('job creation loads the job type selection page', async () => {
-      await ml.jobSourceSelection.selectSource('farequote');
+      await ml.jobSourceSelection.selectSourceForAnomalyDetectionJob('farequote');
     });
 
     it('job creation loads the multi metric job wizard page', async () => {

diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/population_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/population_job.ts
@@ -106,7 +106,7 @@ export default function({ getService }: FtrProviderContext) {
     });
 
     it('job creation loads the job type selection page', async () => {
-      await ml.jobSourceSelection.selectSource('ecommerce');
+      await ml.jobSourceSelection.selectSourceForAnomalyDetectionJob('ecommerce');
     });
 
     it('job creation loads the population job wizard page', async () => {

diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/saved_search_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/saved_search_job.ts
@@ -294,7 +294,7 @@ export default function({ getService }: FtrProviderContext) {
         });
 
         it('job creation loads the job type selection page', async () => {
-          await ml.jobSourceSelection.selectSource(testData.jobSource);
+          await ml.jobSourceSelection.selectSourceForAnomalyDetectionJob(testData.jobSource);
         });
 
         it('job creation loads the multi metric job wizard page', async () => {

diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/single_metric_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/single_metric_job.ts
@@ -91,7 +91,7 @@ export default function({ getService }: FtrProviderContext) {
     });
 
     it('job creation loads the job type selection page', async () => {
-      await ml.jobSourceSelection.selectSource('farequote');
+      await ml.jobSourceSelection.selectSourceForAnomalyDetectionJob('farequote');
     });
 
     it('job creation loads the single metric job wizard page', async () => {

diff --git a/x-pack/test/functional/services/machine_learning/job_source_selection.ts b/x-pack/test/functional/services/machine_learning/job_source_selection.ts
@@ -8,6 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export function MachineLearningJobSourceSelectionProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
 
   return {
     async assertSourceListContainsEntry(sourceName: string) {
@@ -21,16 +22,20 @@ export function MachineLearningJobSourceSelectionProvider({ getService }: FtrPro
       await this.assertSourceListContainsEntry(sourceName);
     },
 
-    async selectSource(sourceName: string) {
+    async selectSource(sourceName: string, nextPageSubj: string) {
       await this.filterSourceSelection(sourceName);
-      await testSubjects.clickWhenNotDisabled(`savedObjectTitle${sourceName}`);
-      await testSubjects.existOrFail('mlPageJobTypeSelection');
+      await retry.tryForTime(30 * 1000, async () => {
+        await testSubjects.clickWhenNotDisabled(`savedObjectTitle${sourceName}`);
+        await testSubjects.existOrFail(nextPageSubj, { timeout: 10 * 1000 });
+      });
+    },
+
+    async selectSourceForAnomalyDetectionJob(sourceName: string) {
+      await this.selectSource(sourceName, 'mlPageJobTypeSelection');
     },
 
     async selectSourceForIndexBasedDataVisualizer(sourceName: string) {
-      await this.filterSourceSelection(sourceName);
-      await testSubjects.clickWhenNotDisabled(`savedObjectTitle${sourceName}`);
-      await testSubjects.existOrFail('mlPageIndexDataVisualizer', { timeout: 10 * 1000 });
+      await this.selectSource(sourceName, 'mlPageIndexDataVisualizer');
     },
   };
 }