From ca1d92409f9dd0036710fbec849241fd20db469d Mon Sep 17 00:00:00 2001
From: Lee Hinman <lee@writequit.org>
Date: Wed, 29 Jun 2016 09:29:46 -0600
Subject: [PATCH] Move setup into a @Before method

Original commit: elastic/x-pack-elasticsearch@21b8cb5be30d757917f6ea825a0f55a468ea6edc
---
 .../xpack/security/MigrateToolIT.java         | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/elasticsearch/qa/security-migrate-tests/src/test/java/org/elasticsearch/xpack/security/MigrateToolIT.java b/elasticsearch/qa/security-migrate-tests/src/test/java/org/elasticsearch/xpack/security/MigrateToolIT.java
index 5b3b36e5674..f84971981a1 100644
--- a/elasticsearch/qa/security-migrate-tests/src/test/java/org/elasticsearch/xpack/security/MigrateToolIT.java
+++ b/elasticsearch/qa/security-migrate-tests/src/test/java/org/elasticsearch/xpack/security/MigrateToolIT.java
@@ -7,7 +7,6 @@ package org.elasticsearch.xpack.security;
 
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
-import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.cli.MockTerminal;
 import org.elasticsearch.client.Client;
@@ -27,6 +26,7 @@ import org.elasticsearch.xpack.security.authc.support.SecuredString;
 import org.elasticsearch.xpack.security.authz.RoleDescriptor;
 import org.elasticsearch.xpack.security.client.SecurityClient;
 import org.elasticsearch.xpack.security.user.User;
+import org.junit.Before;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -39,6 +39,16 @@ import static org.hamcrest.Matchers.containsString;
  */
 public class MigrateToolIT extends MigrateToolTestCase {
 
+    @Before
+    public void setupUpTest() throws Exception {
+        Client client = getClient();
+        SecurityClient c = new SecurityClient(client);
+
+        // Add an existing user so the tool will skip it
+        PutUserResponse pur = c.preparePutUser("existing", "s3kirt".toCharArray(), "role1", "user").get();
+        assertTrue(pur.created());
+    }
+
     private static String[] args(String command) {
         if (!Strings.hasLength(command)) {
             return Strings.EMPTY_ARRAY;
@@ -47,30 +57,15 @@ public class MigrateToolIT extends MigrateToolTestCase {
     }
 
     public void testRunMigrateTool() throws Exception {
-        String integHome = System.getProperty("tests.config.dir");
-        logger.info("--> HOME: {}", integHome);
         Settings settings = Settings.builder()
                 .put("path.home", createTempDir().toAbsolutePath().toString())
                 .build();
+        String integHome = System.getProperty("tests.config.dir");
+        logger.info("--> HOME: {}", integHome);
         // Cluster should already be up
         String url = "http://" + getHttpURL();
         logger.info("--> using URL: {}", url);
         MockTerminal t = new MockTerminal();
-        Client client = getClient();
-        SecurityClient c = new SecurityClient(client);
-
-        // Add an existing user so the tool will skip it
-        PutUserResponse pur = c.preparePutUser("existing", "s3kirt".toCharArray(), "role1", "user").get();
-        assertTrue(pur.created());
-
-        // Wait for the security index to be green
-        ClusterHealthResponse actionGet = client.admin().cluster()
-                .health(Requests.clusterHealthRequest(SecurityTemplateService.SECURITY_INDEX_NAME)
-                        .timeout(TimeValue.timeValueSeconds(30))
-                        .waitForGreenStatus()
-                        .waitForEvents(Priority.LANGUID)
-                        .waitForRelocatingShards(0))
-                .actionGet();
         ESNativeRealmMigrateTool.MigrateUserOrRoles muor = new ESNativeRealmMigrateTool.MigrateUserOrRoles();
         OptionParser parser = muor.getParser();
         OptionSet options = parser.parse("-u", "test_admin", "-p", "changeme", "-U", url, "-c", integHome);