From 6b31fe21f1da8ac486611ad149c0a329017f6b1b Mon Sep 17 00:00:00 2001
From: Dimitris Athanasiou <dimitris@elastic.co>
Date: Fri, 18 May 2018 14:52:14 +0300
Subject: [PATCH] [ML][TEST] Make AutodetectMemoryLimitIT less fragile

These tests aim to check the set model memory limit is
respected. Additionally, it was asserting counts of
partition, by, over fields in an attempt to check that
the used memory is spent meaningfully. However, this
made the tests fragile, as changes in the ml-cpp could
lead to CI failures.

This commit removes those assertions. We are working on
adding tests in ml-cpp that will compensate.
---
 .../ml/integration/AutodetectMemoryLimitIT.java | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/x-pack/qa/ml-native-tests/src/test/java/org/elasticsearch/xpack/ml/integration/AutodetectMemoryLimitIT.java b/x-pack/qa/ml-native-tests/src/test/java/org/elasticsearch/xpack/ml/integration/AutodetectMemoryLimitIT.java
index f54f1bf54e932..4e0aa9c7e0613 100644
--- a/x-pack/qa/ml-native-tests/src/test/java/org/elasticsearch/xpack/ml/integration/AutodetectMemoryLimitIT.java
+++ b/x-pack/qa/ml-native-tests/src/test/java/org/elasticsearch/xpack/ml/integration/AutodetectMemoryLimitIT.java
@@ -33,7 +33,7 @@
 public class AutodetectMemoryLimitIT extends MlNativeAutodetectIntegTestCase {
 
     @After
-    public void cleanUpTest() throws Exception {
+    public void cleanUpTest() {
         cleanUp();
     }
 
@@ -75,19 +75,10 @@ public void testTooManyPartitions() throws Exception {
         closeJob(job.getId());
 
         // Assert we haven't violated the limit too much
-        // and a balance of partitions/by fields were created
         GetJobsStatsAction.Response.JobStats jobStats = getJobStats(job.getId()).get(0);
         ModelSizeStats modelSizeStats = jobStats.getModelSizeStats();
         assertThat(modelSizeStats.getModelBytes(), lessThan(35000000L));
         assertThat(modelSizeStats.getModelBytes(), greaterThan(30000000L));
-
-        // it is important to check that while we rejected partitions, we still managed
-        // to create some by fields; it shows we utilize memory in a meaningful way
-        // rather than creating empty partitions
-        assertThat(modelSizeStats.getTotalPartitionFieldCount(), lessThan(900L));
-        assertThat(modelSizeStats.getTotalPartitionFieldCount(), greaterThan(650L));
-        assertThat(modelSizeStats.getTotalByFieldCount(), lessThan(900L));
-        assertThat(modelSizeStats.getTotalByFieldCount(), greaterThan(650L));
         assertThat(modelSizeStats.getMemoryStatus(), equalTo(ModelSizeStats.MemoryStatus.HARD_LIMIT));
     }
 
@@ -133,8 +124,6 @@ public void testTooManyByFields() throws Exception {
         ModelSizeStats modelSizeStats = jobStats.getModelSizeStats();
         assertThat(modelSizeStats.getModelBytes(), lessThan(36000000L));
         assertThat(modelSizeStats.getModelBytes(), greaterThan(30000000L));
-        assertThat(modelSizeStats.getTotalByFieldCount(), lessThan(1900L));
-        assertThat(modelSizeStats.getTotalByFieldCount(), greaterThan(1500L));
         assertThat(modelSizeStats.getMemoryStatus(), equalTo(ModelSizeStats.MemoryStatus.HARD_LIMIT));
     }
 
@@ -184,9 +173,6 @@ public void testTooManyByAndOverFields() throws Exception {
         ModelSizeStats modelSizeStats = jobStats.getModelSizeStats();
         assertThat(modelSizeStats.getModelBytes(), lessThan(36000000L));
         assertThat(modelSizeStats.getModelBytes(), greaterThan(24000000L));
-        assertThat(modelSizeStats.getTotalByFieldCount(), equalTo(7L));
-        assertThat(modelSizeStats.getTotalOverFieldCount(), greaterThan(40000L));
-        assertThat(modelSizeStats.getTotalOverFieldCount(), lessThan(50000L));
         assertThat(modelSizeStats.getMemoryStatus(), equalTo(ModelSizeStats.MemoryStatus.HARD_LIMIT));
     }
 
@@ -237,7 +223,6 @@ public void testManyDistinctOverFields() throws Exception {
         ModelSizeStats modelSizeStats = jobStats.getModelSizeStats();
         assertThat(modelSizeStats.getModelBytes(), lessThan(90000000L));
         assertThat(modelSizeStats.getModelBytes(), greaterThan(75000000L));
-        assertThat(modelSizeStats.getTotalOverFieldCount(), greaterThan(140000L));
         assertThat(modelSizeStats.getMemoryStatus(), equalTo(ModelSizeStats.MemoryStatus.OK));
     }