Merge pull request kubernetes-client#1865 from dddddai/master

k8s-ci-robot · web-flow · commit c1dbb4155fc1 · 2021-09-07T23:29:20.000-07:00
Kill some hard-coded sleep in tests
diff --git a/util/src/test/java/io/kubernetes/client/CopyTest.java b/util/src/test/java/io/kubernetes/client/CopyTest.java
@@ -29,6 +29,7 @@
 import io.kubernetes.client.util.exception.CopyNotSupportedException;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Paths;
 import org.junit.Before;
 import org.junit.Rule;
@@ -69,13 +70,14 @@ public void testUrl() throws IOException, ApiException, InterruptedException {
                     .withBody("{}")));
 
     try {
-      copy.copyFileFromPod(pod, "container", "/some/path/to/file");
+      InputStream inputStream = copy.copyFileFromPod(pod, "container", "/some/path/to/file");
+      // block until the connection is established
+      inputStream.read();
+      inputStream.close();
     } catch (IOException | ApiException e) {
       e.printStackTrace();
     }
 
-    Thread.sleep(2000);
-
     wireMockRule.verify(
         getRequestedFor(
                 urlPathEqualTo("/api/v1/namespaces/" + namespace + "/pods/" + podName + "/exec"))
diff --git a/util/src/test/java/io/kubernetes/client/PortForwardTest.java b/util/src/test/java/io/kubernetes/client/PortForwardTest.java
@@ -78,14 +78,12 @@ public void testUrl() throws IOException, ApiException, InterruptedException {
     assertThrows(
         ApiException.class,
         () -> {
-          forward.forward(pod, ports);
+          InputStream inputStream = forward.forward(pod, ports).getInputStream(portNumber);
+          // block until the connection is established
+          inputStream.read();
+          inputStream.close();
         });
 
-    // TODO: Kill this sleep, the trouble is that the test tries to validate before the
-    // connection
-    // event has happened
-    Thread.sleep(2000);
-
     wireMockRule.verify(
         getRequestedFor(
                 urlPathEqualTo(
