From 2c91618f65fa78a783463a548b941e423886e010 Mon Sep 17 00:00:00 2001 From: Haytham Mohamed Date: Wed, 18 Sep 2019 13:06:46 -0500 Subject: [PATCH] merge 1.0.x into master and fix failing tests --- .../kubernetes/discovery/KubernetesDiscoveryClientTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTest.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTest.java index 7542c15d..8eac4a77 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTest.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTest.java @@ -183,7 +183,7 @@ public class KubernetesDiscoveryClientTest { .addNewPort("http", 80, "TCP").endSubset().build()) .once(); - mockServer.expect().get().withPath("/api/v1/services/endpoint") + mockServer.expect().get().withPath("/api/v1/namespaces/test/services/endpoint") .andReturn(200, new ServiceBuilder().withNewMetadata() .withName("endpoint").withLabels(new HashMap() { { @@ -215,7 +215,7 @@ public class KubernetesDiscoveryClientTest { .endAddress().addNewPort("https", 443, "TCP").endSubset().build()) .once(); - mockServer.expect().get().withPath("/api/v1/services/endpoint") + mockServer.expect().get().withPath("/api/v1/namespaces/test/services/endpoint") .andReturn(200, new ServiceBuilder().withNewMetadata() .withName("endpoint").withLabels(new HashMap() { {