Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: adjust and enable heartbeat tests #202

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ci: adjust and enable heartbeat tests #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9234258
it: adjust heartbeat integration tests to rust-driver logs
muzarski Oct 30, 2024
5d6c2dd
ci: enable 2 heartbeat tests
muzarski Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ SCYLLA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
:ConsistencyTwoNodeClusterTests.*\
:ConsistencyThreeNodeClusterTests.*\
:SerialConsistencyTests.*\
:HeartbeatTests.*\
:PreparedTests.*\
:CassandraTypes/CassandraTypesTests/*.Integration_Cassandra_*\
:BatchSingleNodeClusterTests*:BatchCounterSingleNodeClusterTests*:BatchCounterThreeNodeClusterTests*\
Expand All @@ -22,6 +23,7 @@ SCYLLA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
:PreparedMetadataTests.*\
:UseKeyspaceCaseSensitiveTests.*\
:-PreparedTests.Integration_Cassandra_PreparedIDUnchangedDuringReprepare\
:HeartbeatTests.Integration_Cassandra_HeartbeatFailed\
:ExecutionProfileTest.InvalidName\
:*NoCompactEnabledConnection\
:PreparedMetadataTests.Integration_Cassandra_AlterDoesntUpdateColumnCount\
Expand All @@ -36,6 +38,7 @@ CASSANDRA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
:ConsistencyTwoNodeClusterTests.*\
:ConsistencyThreeNodeClusterTests.*\
:SerialConsistencyTests.*\
:HeartbeatTests.*\
:PreparedTests.*\
:CassandraTypes/CassandraTypesTests/*.Integration_Cassandra_*\
:ErrorTests.*\
Expand All @@ -49,6 +52,7 @@ CASSANDRA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
:UseKeyspaceCaseSensitiveTests.*\
:-PreparedTests.Integration_Cassandra_PreparedIDUnchangedDuringReprepare\
:PreparedTests.Integration_Cassandra_FailFastWhenPreparedIDChangesDuringReprepare\
:HeartbeatTests.Integration_Cassandra_HeartbeatFailed\
:SslTests.Integration_Cassandra_ReconnectAfterClusterCrashAndRestart\
:ExecutionProfileTest.InvalidName\
:*NoCompactEnabledConnection\
Expand Down
4 changes: 2 additions & 2 deletions tests/src/integration/tests/test_heartbeat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class HeartbeatTests : public Integration {
CASSANDRA_INTEGRATION_TEST_F(HeartbeatTests, HeartbeatEnabled) {
CHECK_FAILURE;

logger_.add_critera("Heartbeat completed on host " + ccm_->get_ip_prefix());
logger_.add_critera("Keepalive request successful on connection to node " + ccm_->get_ip_prefix());
Cluster cluster = default_cluster().with_connection_heartbeat_interval(1); // Quick heartbeat
connect(cluster);

Expand All @@ -59,7 +59,7 @@ CASSANDRA_INTEGRATION_TEST_F(HeartbeatTests, HeartbeatEnabled) {
CASSANDRA_INTEGRATION_TEST_F(HeartbeatTests, HeartbeatDisabled) {
CHECK_FAILURE;

logger_.add_critera("Heartbeat completed on host " + ccm_->get_ip_prefix());
logger_.add_critera("Keepalive request successful on connection to node " + ccm_->get_ip_prefix());
Cluster cluster = default_cluster().with_connection_heartbeat_interval(0);
connect(cluster);

Expand Down