Skip to content

Commit 96c72f8

Browse files
authored
Bump CRT version and attempt to fix flaky tests (#5141)
1 parent 7179675 commit 96c72f8

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/internal/AwsCrtConfigurationUtilsTest.java

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,24 @@
2121

2222
import java.time.Duration;
2323
import java.util.stream.Stream;
24+
import org.junit.jupiter.api.AfterAll;
2425
import org.junit.jupiter.api.Assumptions;
2526
import org.junit.jupiter.api.Test;
2627
import org.junit.jupiter.params.ParameterizedTest;
2728
import org.junit.jupiter.params.provider.Arguments;
2829
import org.junit.jupiter.params.provider.MethodSource;
30+
import software.amazon.awssdk.crt.CrtResource;
2931
import software.amazon.awssdk.crt.io.SocketOptions;
3032
import software.amazon.awssdk.crt.io.TlsCipherPreference;
3133
import software.amazon.awssdk.http.crt.TcpKeepAliveConfiguration;
3234

3335
class AwsCrtConfigurationUtilsTest {
3436

37+
@AfterAll
38+
public static void tearDown() {
39+
CrtResource.waitForNoResources();
40+
}
41+
3542
@ParameterizedTest
3643
@MethodSource("cipherPreferences")
3744
void resolveCipherPreference_pqNotSupported_shouldFallbackToSystemDefault(Boolean preferPqTls,
@@ -57,13 +64,16 @@ private static Stream<Arguments> cipherPreferences() {
5764
@ParameterizedTest
5865
@MethodSource("tcpKeepAliveConfiguration")
5966
void tcpKeepAliveConfiguration(TcpKeepAliveConfiguration tcpKeepAliveConfiguration, Duration connectionTimeout, SocketOptions expected) {
60-
assertThat(AwsCrtConfigurationUtils.buildSocketOptions(tcpKeepAliveConfiguration, connectionTimeout))
61-
.satisfies(socketOptions -> {
62-
assertThat(socketOptions.connectTimeoutMs).isEqualTo(expected.connectTimeoutMs);
63-
assertThat(socketOptions.keepAlive).isEqualTo(expected.keepAlive);
64-
assertThat(socketOptions.keepAliveIntervalSecs).isEqualTo(expected.keepAliveIntervalSecs);
65-
assertThat(socketOptions.keepAliveTimeoutSecs).isEqualTo(expected.keepAliveTimeoutSecs);
66-
});
67+
try (SocketOptions socketOptions = AwsCrtConfigurationUtils.buildSocketOptions(tcpKeepAliveConfiguration,
68+
connectionTimeout)) {
69+
assertThat(socketOptions)
70+
.satisfies(options -> {
71+
assertThat(options.connectTimeoutMs).isEqualTo(expected.connectTimeoutMs);
72+
assertThat(options.keepAlive).isEqualTo(expected.keepAlive);
73+
assertThat(options.keepAliveIntervalSecs).isEqualTo(expected.keepAliveIntervalSecs);
74+
assertThat(options.keepAliveTimeoutSecs).isEqualTo(expected.keepAliveTimeoutSecs);
75+
});
76+
}
6777
}
6878

6979
private static Stream<Arguments> tcpKeepAliveConfiguration() {

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<rxjava.version>2.2.21</rxjava.version>
121121
<commons-codec.verion>1.15</commons-codec.verion>
122122
<jmh.version>1.29</jmh.version>
123-
<awscrt.version>0.29.9</awscrt.version>
123+
<awscrt.version>0.29.18</awscrt.version>
124124

125125
<!--Test dependencies -->
126126
<junit5.version>5.10.0</junit5.version>

0 commit comments

Comments
 (0)