test: wait in startTarantool() / stopTarantool()

It fixes race conditions in testLongParallelCloseReconnects: an attempt
to start jdk-testing instance against already started one could be
performed because stopTarantool() did not wait until an instance will
really stop.

Use these functions in setupEnv() / cleanupEnv() to avoid possible race
conditions.

Author: Totktonada

src/test/java/org/tarantool/AbstractTarantoolConnectorIT.java

@@ -82,7 +82,7 @@ public abstract class AbstractTarantoolConnectorIT {
     @BeforeAll
     public static void setupEnv() {
         control = new TarantoolControl();
-        control.start("jdk-testing");
+        startTarantool("jdk-testing");
 
         console = openConsole();
 
@@ -104,7 +104,7 @@ public static void cleanupEnv() {
 
             console.close();
         } finally {
-            control.stop("jdk-testing");
+            stopTarantool("jdk-testing");
         }
     }
 
@@ -189,12 +189,14 @@ protected List<?> consoleSelect(String spaceName, Object key) {
         return console.eval(sb.toString());
     }
 
-    protected void stopTarantool(String instance) {
+    protected static void stopTarantool(String instance) {
         control.stop(instance);
+        control.waitStopped("jdk-testing");
     }
 
-    protected void startTarantool(String instance) {
+    protected static void startTarantool(String instance) {
         control.start(instance);
+        control.waitStarted("jdk-testing");
     }
 
     /**

src/test/java/org/tarantool/TarantoolControl.java

@@ -16,6 +16,20 @@
  * Wrapper around tarantoolctl utility.
  */
 public class TarantoolControl {
+    public class TarantoolControlException extends RuntimeException {
+        int code;
+        String stdout;
+        String stderr;
+
+        TarantoolControlException(int code, String stdout, String stderr) {
+            super("returned exitcode " + code + "\n" +
+                "[stdout]\n" + stdout + "\n[stderr]\n" + stderr);
+            this.code = code;
+            this.stdout = stdout;
+            this.stderr = stderr;
+        }
+    }
+
     protected static final String tntCtlWorkDir = System.getProperty("tntCtlWorkDir",
         new File("testroot").getAbsolutePath());
     protected static final String instanceDir = new File("src/test").getAbsolutePath();
@@ -163,16 +177,87 @@ public void run() {
             } catch (IOException e) {
                 /* No-op. */
             }
-            throw new RuntimeException("returned exitcode " + code + "\n" +
-                "[stdout]\n" + stdout + "\n[stderr]\n" + stderr);
+            throw new TarantoolControlException(code, stdout, stderr);
+        }
+    }
+
+    /**
+     * Wait until the instance will be started.
+     *
+     * Use tarantoolctl status instanceName.
+     *
+     * Then test the instance with TarantoolTcpConsole (ADMIN environment
+     * variable is set) or TarantoolLocalConsole.
+     *
+     * XXX: Now TarantoolLocalConsole is used unconditionally, see
+     * openConsole().
+     */
+    public void waitStarted(String instanceName) {
+        while (status(instanceName) != 0)
+            sleep();
+
+        while (true) {
+            try {
+                openConsole(instanceName).close();
+                break;
+            } catch (Exception ignored) {
+                /* No-op. */
+            }
+            sleep();
         }
     }
 
+    /**
+     * Wait until the instance will be stopped.
+     *
+     * Use tarantoolctl status instanceName.
+     */
+    public void waitStopped(String instanceName) {
+        while (status(instanceName) != 1)
+            sleep();
+    }
+
     public void start(String instanceName) {
         executeCommand("start", instanceName);
     }
 
     public void stop(String instanceName) {
         executeCommand("stop", instanceName);
     }
+
+    /**
+     * Wrapper for `tarantoolctl status instanceName`.
+     *
+     * Return exit code of the command:
+     *
+     * * 0 -- started;
+     * * 1 -- stopped;
+     * * 2 -- pid file exists, control socket inaccessible.
+     */
+    public int status(String instanceName) {
+        try {
+            executeCommand("status", instanceName);
+        } catch (TarantoolControlException e) {
+            return e.code;
+        }
+
+        return 0;
+    }
+
+    /*
+     * XXX: This function is planned to use text console (from ADMIN
+     * environment variable) when it is available for the instance and
+     * fallback to TarantoolLocalConsole.
+     */
+    public TarantoolConsole openConsole(String instanceName) {
+        return TarantoolConsole.open(tntCtlWorkDir, instanceName);
+    }
+
+    public static void sleep() {
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }