Skip to content

Commit 3cee784

Browse files
authored
fix(build): fix build caused by hanging tests (#4569)
1 parent 228a8fa commit 3cee784

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,6 @@
351351
<artifactId>maven-surefire-plugin</artifactId>
352352
<version>${maven-surefire-plugin.version}</version>
353353
<configuration>
354-
<redirectTestOutputToFile>true</redirectTestOutputToFile>
355354
<rerunFailingTestsCount>2</rerunFailingTestsCount>
356355
<includes>
357356
<include>**/*Tests.java</include>

spring-boot-admin-client/src/test/java/de/codecentric/boot/admin/client/AbstractClientApplicationTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import java.net.InetAddress;
2020
import java.net.UnknownHostException;
21-
import java.time.Duration;
2221
import java.util.Arrays;
2322
import java.util.concurrent.CountDownLatch;
2423
import java.util.stream.Stream;
@@ -114,7 +113,7 @@ public void test_context() throws InterruptedException, UnknownHostException {
114113
.withRequestBody(matchingJsonPath("$.metadata.startup", matching(".+")));
115114

116115
cdl.await();
117-
await().atMost(Duration.ofMillis(2500)).untilAsserted(() -> wireMock.verify(request));
116+
await().untilAsserted(() -> wireMock.verify(request));
118117
}
119118

120119
@Test
@@ -133,7 +132,7 @@ public void test_context_with_snake_case() throws InterruptedException, UnknownH
133132
.withRequestBody(matchingJsonPath("$.metadata.startup", matching(".+")));
134133

135134
cdl.await();
136-
await().atMost(Duration.ofMillis(2500)).untilAsserted(() -> wireMock.verify(request));
135+
await().untilAsserted(() -> wireMock.verify(request));
137136
}
138137

139138
private int getServerPort() {
@@ -154,7 +153,7 @@ public static class TestClientApplication {
154153
@EventListener
155154
public void ping(ApplicationReadyEvent ev) {
156155
new Thread(() -> {
157-
await().atMost(Duration.ofMillis(500)).until(() -> registrator.getRegisteredId() != null);
156+
await().until(() -> registrator.getRegisteredId() != null);
158157
cdl.countDown();
159158
}).start();
160159
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
junit.jupiter.execution.timeout.test.method.default=1m
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
junit.jupiter.execution.timeout.test.method.default=1m

0 commit comments

Comments
 (0)