fabric8io#2320 Prevent from closing client in afterEach for static Ku…

…bernetesClient
piomin · Jul 1, 2020 · 995ac41 · 995ac41
1 parent bce858f
commit 995ac41
Showing 1 changed file with 23 additions and 4 deletions.
diff --git a/...src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServerExtension.java b/...src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServerExtension.java
@@ -43,14 +43,18 @@ public class KubernetesMockServerExtension implements AfterEachCallback, AfterAl
 
   @Override
   public void afterEach(ExtensionContext context) throws Exception {
-    mock.destroy();
-    client.close();
+    Optional<Class<?>> optClass = context.getTestClass();
+    if (optClass.isPresent()) {
+      Class<?> testClass = optClass.get();
+      if (findField(testClass, true) == null) {
+        destroy();
+      }
+    }
   }
 
   @Override
   public void afterAll(ExtensionContext context) throws Exception {
-    mock.destroy();
-    client.close();
+    destroy();
   }
 
   @Override
@@ -93,4 +97,19 @@ private void createKubernetesClient(Class<?> testClass) {
     client = mock.createClient();
   }
 
+  private void destroy() {
+    mock.destroy();
+    client.close();
+  }
+
+  private Field findField(Class<?> testClass, boolean isStatic) {
+    Field[] fields = testClass.getDeclaredFields();
+    for (Field f : fields) {
+      if (f.getType() == KubernetesClient.class && Modifier.isStatic(f.getModifiers()) == isStatic) {
+        return f;
+      }
+    }
+    return null;
+  }
+
 }