[ML] Edits from review

elastic · Oct 7, 2021 · 35424af · 35424af
1 parent e0bddc2
commit 35424af
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 24 deletions.
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/trained_models.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/trained_models.ts
@@ -12,8 +12,8 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('trained models', function () {
     before(async () => {
-      await ml.trainedModels.createdTestTrainedModels('classification', 15, true);
-      await ml.trainedModels.createdTestTrainedModels('regression', 15);
+      await ml.trainedModels.createTestTrainedModels('classification', 15, true);
+      await ml.trainedModels.createTestTrainedModels('regression', 15);
       await ml.securityUI.loginAsMlPowerUser();
       await ml.navigation.navigateToTrainedModels();
     });
@@ -125,11 +125,13 @@ export default function ({ getService }: FtrProviderContext) {
 
       await ml.testExecution.logTestStep('should show the delete modal');
       await ml.trainedModelsTable.clickDeleteAction(modelWithoutPipelineData.modelId);
-      await ml.trainedModelsTable.assertDeleteModalExists();
 
       await ml.testExecution.logTestStep('should delete the model');
       await ml.trainedModelsTable.confirmDeleteModel();
-      await ml.trainedModelsTable.assertRowNotExists(modelWithoutPipelineData.modelId);
+      await ml.trainedModelsTable.assertModelDisplayedInTable(
+        modelWithoutPipelineData.modelId,
+        false
+      );
     });
   });
 }
diff --git a/x-pack/test/functional/services/ml/api.ts b/x-pack/test/functional/services/ml/api.ts
@@ -985,7 +985,7 @@ export function MachineLearningAPIProvider({ getService }: FtrProviderContext) {
       return model;
     },
 
-    async createdTestTrainedModels(
+    async createTestTrainedModels(
       modelType: ModelType,
       count: number = 10,
       withIngestPipelines = false

diff --git a/x-pack/test/functional/services/ml/trained_models.ts b/x-pack/test/functional/services/ml/trained_models.ts
@@ -21,12 +21,12 @@ export function TrainedModelsProvider(
   const retry = getService('retry');
 
   return {
-    async createdTestTrainedModels(
+    async createTestTrainedModels(
       modelType: ModelType,
       count: number = 10,
       withIngestPipelines = false
     ) {
-      await mlApi.createdTestTrainedModels(modelType, count, withIngestPipelines);
+      await mlApi.createTestTrainedModels(modelType, count, withIngestPipelines);
     },
 
     async assertStats(expectedTotalCount: number) {

diff --git a/x-pack/test/functional/services/ml/trained_models_table.ts b/x-pack/test/functional/services/ml/trained_models_table.ts
@@ -119,16 +119,10 @@ export function TrainedModelsTableProvider({ getService }: FtrProviderContext) {
       );
     }
 
-    public async assertModelsDisplayedInTable(modelId: string, shouldBeDisplayed: boolean) {
-      if (shouldBeDisplayed) {
-        await this.filterWithSearchString(modelId, 1);
-      } else {
-        if (await testSubjects.exists('mlNoDataFrameModelsFound', { timeout: 1000 })) {
-          // no jobs at all, no other assertion needed
-          return;
-        }
-        await this.filterWithSearchString(modelId, 0);
-      }
+    public async assertModelDisplayedInTable(modelId: string, shouldBeDisplayed: boolean) {
+      await retry.tryForTime(5 * 1000, async () => {
+        await this.filterWithSearchString(modelId, shouldBeDisplayed === true ? 1 : 0);
+      });
     }
 
     public async assertModelsRowFields(modelId: string, expectedRow: TrainedModelRowData) {
@@ -210,14 +204,9 @@ export function TrainedModelsTableProvider({ getService }: FtrProviderContext) {
       });
     }
 
-    public async assertRowNotExists(modelId: string) {
-      await retry.tryForTime(30 * 1000, async () => {
-        await this.filterWithSearchString(modelId, 0);
-      });
-    }
-
     public async clickDeleteAction(modelId: string) {
-      await testSubjects.click(`mlModelsTableRowDeleteAction`);
+      await testSubjects.click(this.rowSelector(modelId, 'mlModelsTableRowDeleteAction'));
+      await this.assertDeleteModalExists();
     }
   })();
 }