Skip to content

Commit

Permalink
Revert "Retry when Spring tests fails to start a Server with a rand…
Browse files Browse the repository at this point in the history
…om port obtained in advance (line#4395)"

This reverts commit 8e96b96.
This causes build failure after Spring Boot is upgrade to 2.7.3 from 2.7.2.
  • Loading branch information
ikhoon authored and heowc committed Sep 24, 2022
1 parent 87bb3fa commit 54b6e06
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 182 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ public Server armeriaServer(
* Wrap {@link Server} with {@link SmartLifecycle}.
*/
@Bean
@ConditionalOnMissingBean(SmartLifecycle.class)
public SmartLifecycle armeriaServerGracefulShutdownLifecycle(Server server) {
return new ArmeriaServerGracefulShutdownLifecycle(server);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.junit.runner.RunWith;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.SmartLifecycle;
import org.springframework.context.annotation.Bean;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles;
Expand All @@ -47,11 +46,6 @@ static class TestConfiguration {
ArmeriaServerConfigurator maxNumConnectionsConfigurator() {
return builder -> builder.maxNumConnections(16);
}

@Bean
SmartLifecycle smartLifecycle(Server server) {
return new RetryableArmeriaServerGracefulShutdownLifecycle(server, 8);
}
}

@Inject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
import org.junit.runner.RunWith;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.SmartLifecycle;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles;
Expand All @@ -52,13 +50,7 @@ public class LocalArmeriaPortHttpsTest {

@SpringBootApplication
@Import(ArmeriaOkServiceConfiguration.class)
static class TestConfiguration {

@Bean
SmartLifecycle smartLifecycle(Server server) {
return new RetryableArmeriaServerGracefulShutdownLifecycle(server, 8);
}
}
static class TestConfiguration {}

private static final ClientFactory clientFactory =
ClientFactory.builder()
Expand Down

This file was deleted.

This file was deleted.

0 comments on commit 54b6e06

Please sign in to comment.