Skip to content

Commit 9e7cdef

Browse files
Bouncheckdkropachev
authored andcommitted
Remove superflouous checks in AdvancedShardAwarenessIT
These patterns ensure that certain steps were taken, but their end result is already covered by pattern checking that reconnection completed with max total number of channels.
1 parent 43178b0 commit 9e7cdef

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

integration-tests/src/test/java/com/datastax/oss/driver/core/pool/AdvancedShardAwarenessIT.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,7 @@ public void should_initialize_all_channels(boolean reuseAddress) {
9595
Map<Pattern, Integer> expectedOccurences =
9696
ImmutableMap.of(
9797
Pattern.compile(".*\\.2:19042.*Reconnection attempt complete, 6/6 channels.*"), 1,
98-
Pattern.compile(".*\\.1:19042.*Reconnection attempt complete, 6/6 channels.*"), 1,
99-
Pattern.compile(".*Reconnection attempt complete.*"), 2,
100-
Pattern.compile(".*\\.1:19042.*New channel added \\[.*"), 5,
101-
Pattern.compile(".*\\.2:19042.*New channel added \\[.*"), 5,
102-
Pattern.compile(".*\\.1:19042\\] Trying to create 5 missing channels.*"), 1,
103-
Pattern.compile(".*\\.2:19042\\] Trying to create 5 missing channels.*"), 1);
98+
Pattern.compile(".*\\.1:19042.*Reconnection attempt complete, 6/6 channels.*"), 1);
10499
DriverConfigLoader loader =
105100
SessionUtils.configLoaderBuilder()
106101
.withBoolean(DefaultDriverOption.SOCKET_REUSE_ADDRESS, reuseAddress)
@@ -203,12 +198,6 @@ public void should_not_struggle_to_fill_pools() {
203198
Pattern.compile(".*\\.2:19042.*Reconnection attempt complete, 66/66 channels.*"),
204199
1 * sessions,
205200
Pattern.compile(".*\\.1:19042.*Reconnection attempt complete, 66/66 channels.*"),
206-
1 * sessions,
207-
Pattern.compile(".*Reconnection attempt complete.*"), 2 * sessions,
208-
Pattern.compile(".*.1:19042.*New channel added \\[.*"), 65 * sessions - tolerance,
209-
Pattern.compile(".*.2:19042.*New channel added \\[.*"), 65 * sessions - tolerance,
210-
Pattern.compile(".*.1:19042\\] Trying to create 65 missing channels.*"), 1 * sessions,
211-
Pattern.compile(".*.2:19042\\] Trying to create 65 missing channels.*"),
212201
1 * sessions);
213202
expectedOccurences.forEach(
214203
(pattern, times) -> assertMatchesAtLeast(pattern, times, appender.list));

0 commit comments

Comments
 (0)