Skip to content

Commit 105ac0f

Browse files
committed
Adjust StateListenerTest
In newer Scylla versions ccm node decomission first causes DOWN event to be sent and then REMOVE. This change adjusts the expected event so that the test passes.
1 parent db99210 commit 105ac0f

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

driver-core/src/test/java/com/datastax/driver/core/StateListenerTest.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,15 @@ public void should_receive_events_when_node_states_change() throws InterruptedEx
5252
ccm().start(1);
5353
listener.waitForEvent();
5454

55-
listener.setExpectedEvent(REMOVE);
55+
// Different expectation for Scylla versions since 6.0.0 and 2024.2, both included
56+
VersionNumber scyllaVer = ccm().getScyllaVersion();
57+
if (scyllaVer != null
58+
&& ((scyllaVer.getMajor() >= 6 && scyllaVer.getMajor() <= 9)
59+
|| (scyllaVer.getMajor() >= 2024 && scyllaVer.getMinor() >= 2))) {
60+
listener.setExpectedEvent(DOWN);
61+
} else {
62+
listener.setExpectedEvent(REMOVE);
63+
}
5664
ccm().decommission(2);
5765
listener.waitForEvent();
5866
}
@@ -91,7 +99,7 @@ private void reportActualEvent(Event event) {
9199
event);
92100
return;
93101
}
94-
logger.debug("Got event {}", event);
102+
logger.info("Got event {}", event);
95103
actualEvent = event;
96104
latch.countDown();
97105
}

0 commit comments

Comments
 (0)