test: improve await reliability

Signed-off-by: Marc Nuri <[email protected]>

Author: manusa

exec/pom.xml

@@ -40,11 +40,6 @@
       <artifactId>java-hamcrest</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.awaitility</groupId>
-      <artifactId>awaitility</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

exec/src/test/java/com/marcnuri/demo/kubernetesclient/ExecITCase.java

@@ -11,7 +11,6 @@
 import java.io.ByteArrayOutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
-import java.util.Objects;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -51,7 +50,8 @@ static void tearDown() {
 
   private static void deletePod() {
     kc.pods().withName("busybox").withGracePeriod(1L).delete();
-    kc.pods().withName("busybox").waitUntilCondition(Objects::isNull, 10, TimeUnit.SECONDS);
+    kc.pods().withName("busybox").waitUntilCondition(p ->
+      p == null || p.getMetadata().getDeletionTimestamp() != null, 10, TimeUnit.SECONDS);
   }
 
   @Test

other/pom.xml

@@ -14,6 +14,10 @@
   <name>${global.name} :: Other Examples</name>
 
   <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>openshift-client</artifactId>
@@ -30,10 +34,6 @@
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.awaitility</groupId>
-      <artifactId>awaitility</artifactId>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

upload/pom.xml

@@ -36,11 +36,6 @@
       <artifactId>java-hamcrest</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.awaitility</groupId>
-      <artifactId>awaitility</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

upload/src/test/java/com/marcnuri/demo/kubernetesclient/UploadITCase.java

@@ -14,7 +14,6 @@
 
 import java.nio.file.Path;
 import java.util.Collections;
-import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 import static com.marcnuri.demo.kubernetesclient.Utils.execCommand;
@@ -56,8 +55,9 @@ static void tearDown() {
   }
 
   private static void deletePod() {
-    kc.pods().withName(name).withGracePeriod(1L).delete();
-    kc.pods().withName(name).waitUntilCondition(Objects::isNull, 10, TimeUnit.SECONDS);
+    kc.pods().withName(name).withGracePeriod(0L).delete();
+    kc.pods().withName(name).waitUntilCondition(p ->
+      p == null || p.getMetadata().getDeletionTimestamp() != null, 10, TimeUnit.SECONDS);
   }
 
   @Test