Merge pull request #1242 from brendandburns/flake-out

Move away from static wire mocks.

Author: k8s-ci-robot

util/src/test/java/io/kubernetes/client/AttachTest.java

@@ -16,9 +16,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
@@ -54,7 +52,7 @@ public void setup() throws IOException {
   public void testUrl() throws IOException, ApiException, InterruptedException {
     Attach attach = new Attach(client);
 
-    stubFor(
+    wireMockRule.stubFor(
         get(urlPathEqualTo("/api/v1/namespaces/" + namespace + "/pods/" + podName + "/attach"))
             .willReturn(
                 aResponse()
@@ -81,7 +79,7 @@ public void testUrl() throws IOException, ApiException, InterruptedException {
     res2.close();
     res3.close();
 
-    verify(
+    wireMockRule.verify(
         getRequestedFor(
                 urlPathEqualTo("/api/v1/namespaces/" + namespace + "/pods/" + podName + "/attach"))
             .withQueryParam("stdin", equalTo("false"))
@@ -90,15 +88,15 @@ public void testUrl() throws IOException, ApiException, InterruptedException {
             .withQueryParam("tty", equalTo("false"))
             .withQueryParam("container", equalTo(container)));
 
-    verify(
+    wireMockRule.verify(
         getRequestedFor(
                 urlPathEqualTo("/api/v1/namespaces/" + namespace + "/pods/" + podName + "/attach"))
             .withQueryParam("stdin", equalTo("true"))
             .withQueryParam("stdout", equalTo("false"))
             .withQueryParam("stderr", equalTo("false"))
             .withQueryParam("tty", equalTo("false")));
 
-    verify(
+    wireMockRule.verify(
         getRequestedFor(
                 urlPathEqualTo("/api/v1/namespaces/" + namespace + "/pods/" + podName + "/attach"))
             .withQueryParam("stdin", equalTo("false"))

util/src/test/java/io/kubernetes/client/DiscoveryTest.java

@@ -16,7 +16,6 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.junit.Assert.assertEquals;
 
@@ -59,7 +58,7 @@ public void testDiscoveryRequest() throws ApiException {
                             .serialize(new V1APIVersions().versions(Arrays.asList("v1", "v2"))))));
     Discovery discovery = new Discovery(apiClient);
     V1APIVersions versions = discovery.versionDiscovery("/foo");
-    verify(1, getRequestedFor(urlPathEqualTo("/foo")));
+    wireMockRule.verify(1, getRequestedFor(urlPathEqualTo("/foo")));
     assertEquals(2, versions.getVersions().size());
   }
 

util/src/test/java/io/kubernetes/client/ExecTest.java

@@ -16,9 +16,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.junit.Assert.assertEquals;
 
@@ -134,7 +132,7 @@ public void testUrl() throws IOException, ApiException, InterruptedException {
 
     V1Pod pod = new V1Pod().metadata(new V1ObjectMeta().name(podName).namespace(namespace));
 
-    stubFor(
+    wireMockRule.stubFor(
         get(urlPathEqualTo("/api/v1/namespaces/" + namespace + "/pods/" + podName + "/exec"))
             .willReturn(
                 aResponse()
@@ -152,7 +150,7 @@ public void testUrl() throws IOException, ApiException, InterruptedException {
         .execute()
         .waitFor();
 
-    verify(
+    wireMockRule.verify(
         getRequestedFor(
                 urlPathEqualTo("/api/v1/namespaces/" + namespace + "/pods/" + podName + "/exec"))
             .withQueryParam("stdin", equalTo("true"))
@@ -162,7 +160,7 @@ public void testUrl() throws IOException, ApiException, InterruptedException {
             .withQueryParam("tty", equalTo("false"))
             .withQueryParam("command", equalTo("cmd")));
 
-    verify(
+    wireMockRule.verify(
         getRequestedFor(
                 urlPathEqualTo("/api/v1/namespaces/" + namespace + "/pods/" + podName + "/exec"))
             .withQueryParam("stdin", equalTo("false"))

util/src/test/java/io/kubernetes/client/PodLogsTest.java

@@ -16,9 +16,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.junit.Assert.assertEquals;
 
@@ -67,7 +65,7 @@ public void testNotFound() throws ApiException, IOException {
                 new V1PodSpec()
                     .containers(Arrays.asList(new V1Container().name(container).image("nginx"))));
 
-    stubFor(
+    wireMockRule.stubFor(
         get(urlPathEqualTo("/api/v1/namespaces/" + namespace + "/pods/" + podName + "/log"))
             .willReturn(
                 aResponse()
@@ -84,7 +82,7 @@ public void testNotFound() throws ApiException, IOException {
       thrown = true;
     }
     assertEquals(thrown, true);
-    verify(
+    wireMockRule.verify(
         getRequestedFor(
                 urlPathEqualTo("/api/v1/namespaces/" + namespace + "/pods/" + podName + "/log"))
             .withQueryParam("container", equalTo(container))
@@ -105,7 +103,7 @@ public void testStream() throws ApiException, IOException {
 
     String content = "this is some\n content for \n various logs \n done";
 
-    stubFor(
+    wireMockRule.stubFor(
         get(urlPathEqualTo("/api/v1/namespaces/" + namespace + "/pods/" + podName + "/log"))
             .willReturn(
                 aResponse()
@@ -116,7 +114,7 @@ public void testStream() throws ApiException, IOException {
     PodLogs logs = new PodLogs(client);
     InputStream is = logs.streamNamespacedPodLog(pod);
 
-    verify(
+    wireMockRule.verify(
         getRequestedFor(
                 urlPathEqualTo("/api/v1/namespaces/" + namespace + "/pods/" + podName + "/log"))
             .withQueryParam("container", equalTo(container))

util/src/test/java/io/kubernetes/client/PortForwardTest.java

@@ -16,9 +16,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static io.kubernetes.client.ExecTest.makeStream;
 import static org.junit.Assert.assertEquals;
@@ -65,7 +63,7 @@ public void testUrl() throws IOException, ApiException, InterruptedException {
 
     V1Pod pod = new V1Pod().metadata(new V1ObjectMeta().name(podName).namespace(namespace));
 
-    stubFor(
+    wireMockRule.stubFor(
         get(urlPathEqualTo("/api/v1/namespaces/" + namespace + "/pods/" + podName + "/portforward"))
             .willReturn(
                 aResponse()
@@ -87,7 +85,7 @@ public void testUrl() throws IOException, ApiException, InterruptedException {
     // event has happened
     Thread.sleep(2000);
 
-    verify(
+    wireMockRule.verify(
         getRequestedFor(
                 urlPathEqualTo(
                     "/api/v1/namespaces/" + namespace + "/pods/" + podName + "/portforward"))