Skip to content

Commit 56db06d

Browse files
committed
fix test
Signed-off-by: wind57 <[email protected]>
1 parent 66cf141 commit 56db06d

File tree

2 files changed

+7
-1
lines changed
  • spring-cloud-kubernetes-integration-tests
    • spring-cloud-kubernetes-k8s-client-discovery-server/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it
    • spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery

2 files changed

+7
-1
lines changed

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryServerClientIT.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@
2222
import io.kubernetes.client.openapi.ApiClient;
2323
import org.junit.jupiter.api.AfterAll;
2424
import org.junit.jupiter.api.BeforeAll;
25+
import org.junit.jupiter.api.MethodOrderer;
26+
import org.junit.jupiter.api.Order;
2527
import org.junit.jupiter.api.Test;
2628

29+
import org.junit.jupiter.api.TestMethodOrder;
2730
import org.springframework.beans.factory.annotation.Autowired;
2831
import org.springframework.boot.test.context.SpringBootTest;
2932
import org.springframework.boot.test.context.TestConfiguration;
@@ -51,6 +54,7 @@
5154
"logging.level.org.springframework.cloud.kubernetes.discovery=debug",
5255
"spring.cloud.kubernetes.discovery.catalogServicesWatchDelay=3000",
5356
"spring.cloud.kubernetes.http.discovery.catalog.watcher.enabled=true" })
57+
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
5458
class DiscoveryServerClientIT extends DiscoveryServerClientBase {
5559

5660
@Autowired
@@ -96,6 +100,7 @@ static void afterAllLocal() {
96100
* </pre>
97101
*/
98102
@Test
103+
@Order(1)
99104
void testBlocking(CapturedOutput output) {
100105
List<String> services = reactiveDiscoveryClient.getServices().collectList().block();
101106
assertThat(services).hasSize(1);
@@ -123,6 +128,7 @@ void testBlocking(CapturedOutput output) {
123128
* </pre>
124129
*/
125130
@Test
131+
@Order(2)
126132
void testReactive() {
127133
List<String> services = discoveryClient.getServices();
128134
assertThat(services).hasSize(1);

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/TestAssertions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ static void assertPodMetadata(ReactiveDiscoveryClient discoveryClient) {
148148
assertThat(wiremockInstance.getInstanceId()).isNotNull();
149149
assertThat(wiremockInstance.getHost()).isNotNull();
150150
assertThat(wiremockInstance.getMetadata()).isEqualTo(Map.of("k8s_namespace", "default", "type", "ClusterIP",
151-
"port.http", "8080", "app", "service-wiremock"));
151+
"port.http", "8080", "app", "service-wiremock"));
152152

153153
}
154154

0 commit comments

Comments
 (0)