Fix a couple of intermittent test failures for the MySQL client (#1658)

* Fix intermittent MySQLConnectionTest#testInflightCommandsFailWhenConnectionClosed failure

The process info should match the sleep query that was executed.

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>

* Fix intermittent MySQLUnixDomainSocketTest.connectWithVertxInstance failure

Manage the dedicated Vert.x and Pool instance separately from the object instances.
Otherwise, the dedicated Vert.x instance is closed asynchronously and then the client stored in the fields cannot be properly closed in the tear down method.

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>

---------

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>

Author: tsegismont

vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLConnectionTest.java

@@ -84,7 +84,7 @@ public void testInflightCommandsFailWhenConnectionClosed(TestContext ctx) {
             Long id = row.getLong("Id");
             String state = row.getString("State");
             String info = row.getString("Info");
-            if ("User sleep".equals(state) || "DO SLEEP(10)".equals(info)) {
+            if ("User sleep".equals(state) || "DO SLEEP(20)".equals(info)) {
               // kill the connection
               conn2.query("KILL CONNECTION " + id).execute(ctx.asyncAssertSuccess(v -> conn2.close()));
               break;

vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLUnixDomainSocketTest.java

@@ -10,11 +10,13 @@
  */
 package io.vertx.mysqlclient;
 
+import io.vertx.core.Future;
 import io.vertx.core.Vertx;
 import io.vertx.core.VertxOptions;
 import io.vertx.ext.unit.Async;
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
+import io.vertx.sqlclient.Pool;
 import io.vertx.sqlclient.PoolOptions;
 import org.junit.After;
 import org.junit.Before;
@@ -81,16 +83,22 @@ public void simpleConnect(TestContext context) {
   @Test
   public void connectWithVertxInstance(TestContext context) {
     Vertx vertx = Vertx.vertx(new VertxOptions().setPreferNativeTransport(true));
+    Pool pool = null;
     try {
-      client = MySQLPool.pool(vertx, new MySQLConnectOptions(options), new PoolOptions());
+      pool = MySQLBuilder.pool(builder -> builder.connectingTo(new MySQLConnectOptions(options)).using(vertx));
       Async async = context.async();
-      client.getConnection(context.asyncAssertSuccess(conn -> {
+      pool
+        .getConnection()
+        .onComplete(context.asyncAssertSuccess(conn -> {
         async.complete();
         conn.close();
       }));
       async.await();
     } finally {
-      vertx.close();
+      if (pool != null) {
+        Future.await(pool.close());
+      }
+      Future.await(vertx.close());
     }
   }