Skip to content

Commit 0b8a952

Browse files
committed
it: enable 4 out of 5 TimestampTests
The remaining test (MonotonicTimestampGenerator) needs further adjustments. Currently it segfaults - I'll create a separate issue for this one. TLDR - currently, the generator provided to `cass_cluster_set_timestamp_gen` is constructed using pure c++ API (no API from cassandra.h is used). It depends on `src/timestamp_generator.cpp`, which we should ultimately remove. However, to remove this file, we need to implement a testing utility which allows us to read the generated timestamps during the test. The test would then need to be rewritten using this new utility.
1 parent 1edef79 commit 0b8a952

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ SCYLLA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
2626
:PreparedMetadataTests.*\
2727
:UseKeyspaceCaseSensitiveTests.*\
2828
:ServerSideFailureTests.*\
29+
:TimestampTests.*\
2930
:MetricsTests.Integration_Cassandra_ErrorsRequestTimeouts\
3031
:MetricsTests.Integration_Cassandra_Requests\
3132
:MetricsTests.Integration_Cassandra_StatsShardConnections\
@@ -38,6 +39,7 @@ SCYLLA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
3839
:ExecutionProfileTest.Integration_Cassandra_LatencyAwareRouting\
3940
:-PreparedTests.Integration_Cassandra_PreparedIDUnchangedDuringReprepare\
4041
:HeartbeatTests.Integration_Cassandra_HeartbeatFailed\
42+
:TimestampTests.Integration_Cassandra_MonotonicTimestampGenerator\
4143
:ControlConnectionTests.Integration_Cassandra_TopologyChange\
4244
:ControlConnectionTests.Integration_Cassandra_FullOutage\
4345
:ControlConnectionTests.Integration_Cassandra_TerminatedUsingMultipleIoThreadsWithError\
@@ -77,6 +79,7 @@ CASSANDRA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
7779
:PreparedMetadataTests.*\
7880
:UseKeyspaceCaseSensitiveTests.*\
7981
:ServerSideFailureTests.*\
82+
:TimestampTests.*\
8083
:MetricsTests.Integration_Cassandra_ErrorsRequestTimeouts\
8184
:MetricsTests.Integration_Cassandra_Requests\
8285
:MetricsTests.Integration_Cassandra_StatsShardConnections\
@@ -90,6 +93,7 @@ CASSANDRA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
9093
:-PreparedTests.Integration_Cassandra_PreparedIDUnchangedDuringReprepare\
9194
:PreparedTests.Integration_Cassandra_FailFastWhenPreparedIDChangesDuringReprepare\
9295
:HeartbeatTests.Integration_Cassandra_HeartbeatFailed\
96+
:TimestampTests.Integration_Cassandra_MonotonicTimestampGenerator\
9397
:ControlConnectionTests.Integration_Cassandra_TopologyChange\
9498
:ControlConnectionTests.Integration_Cassandra_FullOutage\
9599
:ControlConnectionTests.Integration_Cassandra_TerminatedUsingMultipleIoThreadsWithError\

0 commit comments

Comments
 (0)