Refactor

jasontedor · Oct 21, 2018 · 3ba477c · 3ba477c
1 parent 28e2d26
commit 3ba477c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 61 deletions.
diff --git a/x-pack/plugin/ccr/qa/rest/src/test/java/org/elasticsearch/xpack/ccr/CcrRestIT.java b/x-pack/plugin/ccr/qa/rest/src/test/java/org/elasticsearch/xpack/ccr/CcrRestIT.java
@@ -10,10 +10,10 @@
 import org.elasticsearch.common.settings.SecureString;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
+import org.elasticsearch.test.rest.ESRestTestCase;
 import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
 import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
 import org.elasticsearch.xpack.ccr.action.ShardChangesAction;
-import org.elasticsearch.xpack.test.rest.XPackRestTestHelper;
 import org.junit.After;
 
 import static org.elasticsearch.xpack.core.security.authc.support.UsernamePasswordToken.basicAuthHeaderValue;
@@ -37,7 +37,7 @@ protected Settings restClientSettings() {
 
     @After
     public void cleanup() throws Exception {
-        XPackRestTestHelper.waitForPendingTasks(adminClient(), taskName -> taskName.startsWith(ShardChangesAction.NAME));
+        ESRestTestCase.waitForPendingTasks(adminClient(), taskName -> taskName.startsWith(ShardChangesAction.NAME));
     }
 
 }
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/test/rest/XPackRestTestHelper.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/test/rest/XPackRestTestHelper.java
@@ -86,57 +86,4 @@ public static void waitForMlTemplates(RestClient client) throws InterruptedExcep
         }
     }
 
-    /**
-     * Wait for outstanding tasks to complete. The specified admin client is used to check the outstanding tasks and this is done using
-     * {@link ESTestCase#assertBusy(CheckedRunnable)} to give a chance to any outstanding tasks to complete.
-     *
-     * @param adminClient the admin client
-     * @throws Exception if an exception is thrown while checking the outstanding tasks
-     */
-    public static void waitForPendingTasks(final RestClient adminClient) throws Exception {
-        waitForPendingTasks(adminClient, taskName -> false);
-    }
-
-    /**
-     * Wait for outstanding tasks to complete. The specified admin client is used to check the outstanding tasks and this is done using
-     * {@link ESTestCase#assertBusy(CheckedRunnable)} to give a chance to any outstanding tasks to complete. The specified filter is used
-     * to filter out outstanding tasks that are expected to be there.
-     *
-     * @param adminClient the admin client
-     * @param taskFilter  predicate used to filter tasks that are expected to be there
-     * @throws Exception if an exception is thrown while checking the outstanding tasks
-     */
-    public static void waitForPendingTasks(final RestClient adminClient, final Predicate<String> taskFilter) throws Exception {
-        assertBusy(() -> {
-            try {
-                final Request request = new Request("GET", "/_cat/tasks");
-                request.addParameter("detailed", "true");
-                final Response response = adminClient.performRequest(request);
-                /*
-                 * Check to see if there are outstanding tasks; we exclude the list task itself, and any expected outstanding tasks using
-                 * the specified task filter.
-                 */
-                if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
-                    try (BufferedReader responseReader = new BufferedReader(
-                            new InputStreamReader(response.getEntity().getContent(), StandardCharsets.UTF_8))) {
-                        int activeTasks = 0;
-                        String line;
-                        final StringBuilder tasksListString = new StringBuilder();
-                        while ((line = responseReader.readLine()) != null) {
-                            final String taskName = line.split("\\s+")[0];
-                            if (taskName.startsWith(ListTasksAction.NAME) || taskFilter.test(taskName)) {
-                                continue;
-                            }
-                            activeTasks++;
-                            tasksListString.append(line);
-                            tasksListString.append('\n');
-                        }
-                        assertEquals(activeTasks + " active tasks found:\n" + tasksListString, 0, activeTasks);
-                    }
-                }
-            } catch (final IOException e) {
-                throw new AssertionError("Error getting active tasks list", e);
-            }
-        });
-    }
 }
diff --git a/...i-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsRestIT.java b/...i-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsRestIT.java
@@ -16,9 +16,8 @@
 import org.elasticsearch.test.SecuritySettingsSourceField;
 import org.elasticsearch.test.rest.ESRestTestCase;
 import org.elasticsearch.xpack.core.ml.integration.MlRestTestStateCleaner;
-import org.elasticsearch.xpack.ml.MachineLearning;
 import org.elasticsearch.xpack.core.ml.notifications.AuditorField;
-import org.elasticsearch.xpack.test.rest.XPackRestTestHelper;
+import org.elasticsearch.xpack.ml.MachineLearning;
 import org.junit.After;
 import org.junit.Before;
 
@@ -883,7 +882,7 @@ public static void openJob(RestClient client, String jobId) throws IOException {
     @After
     public void clearMlState() throws Exception {
         new MlRestTestStateCleaner(logger, adminClient()).clearMlMetadata();
-        XPackRestTestHelper.waitForPendingTasks(adminClient());
+        ESRestTestCase.waitForPendingTasks(adminClient());
     }
 
     private static class DatafeedBuilder {

diff --git a/...native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/MlJobIT.java b/...native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/MlJobIT.java
@@ -19,7 +19,6 @@
 import org.elasticsearch.xpack.core.ml.job.persistence.AnomalyDetectorsIndex;
 import org.elasticsearch.xpack.core.ml.job.persistence.AnomalyDetectorsIndexFields;
 import org.elasticsearch.xpack.ml.MachineLearning;
-import org.elasticsearch.xpack.test.rest.XPackRestTestHelper;
 import org.junit.After;
 
 import java.io.IOException;
@@ -680,6 +679,6 @@ private String getAliases() throws IOException {
     @After
     public void clearMlState() throws Exception {
         new MlRestTestStateCleaner(logger, adminClient()).clearMlMetadata();
-        XPackRestTestHelper.waitForPendingTasks(adminClient());
+        ESRestTestCase.waitForPendingTasks(adminClient());
     }
 }
diff --git a/x-pack/plugin/src/test/java/org/elasticsearch/xpack/test/rest/XPackRestIT.java b/x-pack/plugin/src/test/java/org/elasticsearch/xpack/test/rest/XPackRestIT.java
@@ -16,6 +16,7 @@
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
 import org.elasticsearch.plugins.MetaDataUpgrader;
 import org.elasticsearch.test.SecuritySettingsSourceField;
+import org.elasticsearch.test.rest.ESRestTestCase;
 import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
 import org.elasticsearch.test.rest.yaml.ClientYamlTestResponse;
 import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
@@ -246,7 +247,7 @@ public void cleanup() throws Exception {
         if (isWaitForPendingTasks()) {
             // This waits for pending tasks to complete, so must go last (otherwise
             // it could be waiting for pending tasks while monitoring is still running).
-            XPackRestTestHelper.waitForPendingTasks(adminClient(), task -> {
+            ESRestTestCase.waitForPendingTasks(adminClient(), task -> {
                     // Don't check rollup jobs because we clear them in the superclass.
                     return task.contains(RollupJob.NAME);
             });