[ML] [Data Frame] Adding pending task wait to the hlrc cleanup (elast…

…ic#42907)
alpar-t · Jun 10, 2019 · 0fe1948 · 0fe1948
1 parent ef02a08
commit 0fe1948
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/DataFrameTransformIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/DataFrameTransformIT.java
@@ -140,7 +140,7 @@ private void indexData(String indexName) throws IOException {
     }
 
     @After
-    public void cleanUpTransforms() throws IOException {
+    public void cleanUpTransforms() throws Exception {
         for (String transformId : transformsToClean) {
             highLevelClient().dataFrame().stopDataFrameTransform(
                     new StopDataFrameTransformRequest(transformId, Boolean.TRUE, null), RequestOptions.DEFAULT);
@@ -152,6 +152,7 @@ public void cleanUpTransforms() throws IOException {
         }
 
         transformsToClean = new ArrayList<>();
+        waitForPendingTasks(adminClient());
     }
 
     public void testCreateDelete() throws IOException {

diff --git a/...c/test/java/org/elasticsearch/client/documentation/DataFrameTransformDocumentationIT.java b/...c/test/java/org/elasticsearch/client/documentation/DataFrameTransformDocumentationIT.java
@@ -74,7 +74,7 @@ public class DataFrameTransformDocumentationIT extends ESRestHighLevelClientTest
     private List<String> transformsToClean = new ArrayList<>();
 
     @After
-    public void cleanUpTransforms() throws IOException {
+    public void cleanUpTransforms() throws Exception {
         for (String transformId : transformsToClean) {
             highLevelClient().dataFrame().stopDataFrameTransform(
                     new StopDataFrameTransformRequest(transformId, Boolean.TRUE, TimeValue.timeValueSeconds(20)), RequestOptions.DEFAULT);
@@ -86,6 +86,7 @@ public void cleanUpTransforms() throws IOException {
         }
 
         transformsToClean = new ArrayList<>();
+        waitForPendingTasks(adminClient());
     }
 
     private void createIndex(String indexName) throws IOException {