Skip to content

Commit 0ecdb8a

Browse files
authored
Merge pull request #1939 from wilkinsona/narrow-static-mocking
Narrow scope of static mocking that breaks Netty 4.2
2 parents 32ef155 + 67f27c4 commit 0ecdb8a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledFailFastExceptionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void test() throws ApiException {
7474

7575
private static void mocks() {
7676
envReaderMockedStatic = Mockito.mockStatic(EnvReader.class);
77-
pathsMockedStatic = Mockito.mockStatic(Paths.class);
77+
pathsMockedStatic = Mockito.mockStatic(Paths.class, Mockito.CALLS_REAL_METHODS);
7878

7979
envReaderMockedStatic.when(() -> EnvReader.getEnv(KubernetesClientPodUtils.KUBERNETES_SERVICE_HOST))
8080
.thenReturn("k8s-host");

spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledNoFailFastExceptionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ void test() throws ApiException {
7777

7878
private static void mocks() {
7979
envReaderMockedStatic = Mockito.mockStatic(EnvReader.class);
80-
pathsMockedStatic = Mockito.mockStatic(Paths.class);
80+
pathsMockedStatic = Mockito.mockStatic(Paths.class, Mockito.CALLS_REAL_METHODS);
8181

8282
envReaderMockedStatic.when(() -> EnvReader.getEnv(KubernetesClientPodUtils.KUBERNETES_SERVICE_HOST))
8383
.thenReturn("k8s-host");

0 commit comments

Comments
 (0)