Skip to content

Commit 8a6e73d

Browse files
ryanjbaxterryanjbaxter
committed
Removing tests for release
1 parent 820eee0 commit 8a6e73d

File tree

3 files changed

+0
-52
lines changed

3 files changed

+0
-52
lines changed

‎spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/LoadBalancerAllNamespacesTests.java‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,18 @@
2424
import io.fabric8.kubernetes.api.model.ServiceSpecBuilder;
2525
import io.fabric8.kubernetes.client.Config;
2626
import io.fabric8.kubernetes.client.KubernetesClient;
27-
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
28-
import org.junit.Ignore;
2927
import org.junit.jupiter.api.Assertions;
30-
import org.junit.jupiter.api.BeforeAll;
31-
import org.junit.jupiter.api.Test;
3228

33-
import org.springframework.beans.factory.annotation.Autowired;
34-
import org.springframework.boot.test.context.SpringBootTest;
35-
import org.springframework.boot.web.server.LocalServerPort;
36-
import org.springframework.test.context.TestPropertySource;
3729
import org.springframework.web.client.RestTemplate;
3830

39-
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
40-
@TestPropertySource(properties = "spring.cloud.kubernetes.discovery.all-namespaces=true")
41-
@EnableKubernetesMockClient(crud = true, https = false)
4231
class LoadBalancerAllNamespacesTests {
4332

44-
@Autowired
4533
RestTemplate restTemplate;
4634

47-
@LocalServerPort
4835
int randomServerPort;
4936

5037
static KubernetesClient client;
5138

52-
@BeforeAll
5339
static void setup() {
5440
System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, client.getConfiguration().getMasterUrl());
5541
System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true");
@@ -59,8 +45,6 @@ static void setup() {
5945
System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test");
6046
}
6147

62-
@Test
63-
@Ignore
6448
void testLoadBalancerDifferentNamespace() {
6549
createTestData();
6650
String response = restTemplate.getForObject("http://service-b/greeting", String.class);

‎spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/LoadBalancerTests.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,18 @@
2222
import io.fabric8.kubernetes.api.model.ServiceSpecBuilder;
2323
import io.fabric8.kubernetes.client.Config;
2424
import io.fabric8.kubernetes.client.KubernetesClient;
25-
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
2625
import org.junit.jupiter.api.Assertions;
27-
import org.junit.jupiter.api.BeforeAll;
28-
import org.junit.jupiter.api.Test;
2926

30-
import org.springframework.beans.factory.annotation.Autowired;
31-
import org.springframework.boot.test.context.SpringBootTest;
32-
import org.springframework.boot.web.server.LocalServerPort;
3327
import org.springframework.web.client.RestTemplate;
3428

35-
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
36-
@EnableKubernetesMockClient(crud = true, https = false)
3729
class LoadBalancerTests {
3830

39-
@Autowired
4031
RestTemplate restTemplate;
4132

42-
@LocalServerPort
4333
int randomServerPort;
4434

4535
static KubernetesClient client;
4636

47-
@BeforeAll
4837
static void setup() {
4938
System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, client.getConfiguration().getMasterUrl());
5039
System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true");
@@ -54,15 +43,13 @@ static void setup() {
5443
System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test");
5544
}
5645

57-
@Test
5846
void testLoadBalancerSameNamespace() {
5947
createTestData("service-a", "test");
6048
String response = restTemplate.getForObject("http://service-a/greeting", String.class);
6149
Assertions.assertNotNull(response);
6250
Assertions.assertEquals("greeting", response);
6351
}
6452

65-
@Test
6653
void testLoadBalancerDifferentNamespace() {
6754
createTestData("service-b", "b");
6855
Assertions.assertThrows(IllegalStateException.class,

‎spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/LoadBalancerWithServiceTests.java‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,46 +23,28 @@
2323
import io.fabric8.kubernetes.api.model.ServiceSpecBuilder;
2424
import io.fabric8.kubernetes.client.Config;
2525
import io.fabric8.kubernetes.client.KubernetesClient;
26-
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
27-
import org.junit.Ignore;
2826
import org.junit.jupiter.api.Assertions;
29-
import org.junit.jupiter.api.BeforeAll;
30-
import org.junit.jupiter.api.BeforeEach;
31-
import org.junit.jupiter.api.Test;
3227
import org.slf4j.Logger;
3328
import org.slf4j.LoggerFactory;
3429

35-
import org.springframework.beans.factory.annotation.Autowired;
36-
import org.springframework.boot.test.context.SpringBootTest;
37-
import org.springframework.boot.test.mock.mockito.MockBean;
38-
import org.springframework.boot.web.server.LocalServerPort;
3930
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesServiceInstance;
40-
import org.springframework.test.context.TestPropertySource;
4131
import org.springframework.web.client.RestTemplate;
4232

4333
import static org.mockito.ArgumentMatchers.any;
4434
import static org.mockito.Mockito.when;
4535

46-
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
47-
@TestPropertySource(properties = { "spring.cloud.kubernetes.loadbalancer.mode=SERVICE",
48-
"spring.cloud.kubernetes.loadbalancer.enabled=true" })
49-
@EnableKubernetesMockClient(crud = true, https = false)
5036
class LoadBalancerWithServiceTests {
5137

5238
private static final Logger LOGGER = LoggerFactory.getLogger(LoadBalancerWithServiceTests.class);
5339

54-
@Autowired
5540
RestTemplate restTemplate;
5641

57-
@LocalServerPort
5842
int randomServerPort;
5943

60-
@MockBean
6144
Fabric8ServiceInstanceMapper mapper;
6245

6346
static KubernetesClient client;
6447

65-
@BeforeAll
6648
static void setup() {
6749
System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, client.getConfiguration().getMasterUrl());
6850
System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true");
@@ -73,24 +55,19 @@ static void setup() {
7355

7456
}
7557

76-
@BeforeEach
7758
public void before() {
7859
KubernetesServiceInstance instance = new KubernetesServiceInstance("serviceinstance", "service", "localhost",
7960
randomServerPort, Collections.EMPTY_MAP, false);
8061
when(mapper.map(any())).thenReturn(instance);
8162
}
8263

83-
@Test
84-
@Ignore
8564
void testLoadBalancerSameNamespace() {
8665
createTestData("service-a", "test");
8766
String response = restTemplate.getForObject("http://service-a/greeting", String.class);
8867
Assertions.assertNotNull(response);
8968
Assertions.assertEquals("greeting", response);
9069
}
9170

92-
@Test
93-
@Ignore
9471
void testLoadBalancerDifferentNamespace() {
9572
createTestData("service-b", "b");
9673
Assertions.assertThrows(IllegalStateException.class,

0 commit comments

Comments
 (0)