Do not fail on close() if test Kudu server is not initialized

trinodb · Mar 1, 2022 · fef4b2d · fef4b2d
1 parent 42d6342
commit fef4b2d
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 8 deletions.
diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/AbstractKuduConnectorTest.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/AbstractKuduConnectorTest.java
@@ -57,7 +57,10 @@ protected QueryRunner createQueryRunner()
     @AfterClass(alwaysRun = true)
     public final void destroy()
     {
-        kuduServer.close();
+        if (kuduServer != null) {
+            kuduServer.close();
+            kuduServer = null;
+        }
     }
 
     @Override

diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationDecimalColumns.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationDecimalColumns.java
@@ -53,7 +53,10 @@ protected QueryRunner createQueryRunner()
     @AfterClass(alwaysRun = true)
     public final void destroy()
     {
-        kuduServer.close();
+        if (kuduServer != null) {
+            kuduServer.close();
+            kuduServer = null;
+        }
     }
 
     @Test

diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationDynamicFilter.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationDynamicFilter.java
@@ -84,7 +84,10 @@ protected QueryRunner createQueryRunner()
     @AfterClass(alwaysRun = true)
     public final void destroy()
     {
-        kuduServer.close();
+        if (kuduServer != null) {
+            kuduServer.close();
+            kuduServer = null;
+        }
     }
 
     @Test(timeOut = 30_000)

diff --git a/...in/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationGroupedExecution.java b/...in/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationGroupedExecution.java
@@ -63,7 +63,10 @@ protected QueryRunner createQueryRunner()
     @AfterClass(alwaysRun = true)
     public final void destroy()
     {
-        kuduServer.close();
+        if (kuduServer != null) {
+            kuduServer.close();
+            kuduServer = null;
+        }
     }
 
     @Test

diff --git a/...in/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationHashPartitioning.java b/...in/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationHashPartitioning.java
@@ -39,7 +39,10 @@ protected QueryRunner createQueryRunner()
     @AfterClass(alwaysRun = true)
     public final void destroy()
     {
-        kuduServer.close();
+        if (kuduServer != null) {
+            kuduServer.close();
+            kuduServer = null;
+        }
     }
 
     @Test

diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationIntegerColumns.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationIntegerColumns.java
@@ -47,7 +47,10 @@ protected QueryRunner createQueryRunner()
     @AfterClass(alwaysRun = true)
     public final void destroy()
     {
-        kuduServer.close();
+        if (kuduServer != null) {
+            kuduServer.close();
+            kuduServer = null;
+        }
     }
 
     @Test

diff --git a/...n/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationRangePartitioning.java b/...n/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationRangePartitioning.java
@@ -95,7 +95,10 @@ protected QueryRunner createQueryRunner()
     @AfterClass(alwaysRun = true)
     public final void destroy()
     {
-        kuduServer.close();
+        if (kuduServer != null) {
+            kuduServer.close();
+            kuduServer = null;
+        }
     }
 
     @Test

diff --git a/...n/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationSchemaNotExisting.java b/...n/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationSchemaNotExisting.java
@@ -45,7 +45,10 @@ protected QueryRunner createQueryRunner()
     @AfterClass(alwaysRun = true)
     public final void destroy()
     {
-        kuduServer.close();
+        if (kuduServer != null) {
+            kuduServer.close();
+            kuduServer = null;
+        }
     }
 
     @Test