Skip to content

Commit a420462

Browse files
authored
Merge pull request #291 from muzarski/execution-profile-filtering
execution_profile: whitelist/blacklist filtering
2 parents 9689f17 + 90d45b7 commit a420462

File tree

11 files changed

+1146
-178
lines changed

11 files changed

+1146
-178
lines changed

Makefile

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,23 @@ SCYLLA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
3131
:ServerSideFailureTests.*\
3232
:ServerSideFailureThreeNodeTests.*\
3333
:TimestampTests.*\
34+
:HostFilterTest.*\
35+
:ExecutionProfileTest.*\
36+
:DCExecutionProfileTest.*\
37+
:DisconnectedNullStringApiArgsTest.*\
3438
:MetricsTests.Integration_Cassandra_ErrorsRequestTimeouts\
3539
:MetricsTests.Integration_Cassandra_Requests\
3640
:MetricsTests.Integration_Cassandra_StatsShardConnections\
37-
:DisconnectedNullStringApiArgsTest.Integration_Cassandra_SetContactPoints\
38-
:DisconnectedNullStringApiArgsTest.Integration_Cassandra_ConnectKeyspaceNullKeyspace\
39-
:ExecutionProfileTest.Integration_Cassandra_InvalidName\
40-
:ExecutionProfileTest.Integration_Cassandra_RequestTimeout\
41-
:ExecutionProfileTest.Integration_Cassandra_Consistency\
42-
:ExecutionProfileTest.Integration_Cassandra_SerialConsistency\
43-
:ExecutionProfileTest.Integration_Cassandra_LatencyAwareRouting\
4441
:-PreparedTests.Integration_Cassandra_PreparedIDUnchangedDuringReprepare\
4542
:SchemaMetadataTest.Integration_Cassandra_RegularMetadataNotMarkedVirtual\
4643
:SchemaMetadataTest.Integration_Cassandra_VirtualMetadata\
4744
:HeartbeatTests.Integration_Cassandra_HeartbeatFailed\
4845
:TimestampTests.Integration_Cassandra_MonotonicTimestampGenerator\
46+
:ExecutionProfileTest.Integration_Cassandra_RoundRobin\
47+
:ExecutionProfileTest.Integration_Cassandra_TokenAwareRouting\
48+
:ExecutionProfileTest.Integration_Cassandra_RetryPolicy\
49+
:ExecutionProfileTest.Integration_Cassandra_SpeculativeExecutionPolicy\
50+
:DCExecutionProfileTest.Integration_Cassandra_DCAware\
4951
:ControlConnectionTests.Integration_Cassandra_TopologyChange\
5052
:ControlConnectionTests.Integration_Cassandra_FullOutage\
5153
:ControlConnectionTests.Integration_Cassandra_TerminatedUsingMultipleIoThreadsWithError\
@@ -90,22 +92,24 @@ CASSANDRA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
9092
:ServerSideFailureTests.*\
9193
:ServerSideFailureThreeNodeTests.*\
9294
:TimestampTests.*\
95+
:HostFilterTest.*\
96+
:ExecutionProfileTest.*\
97+
:DCExecutionProfileTest.*\
98+
:DisconnectedNullStringApiArgsTest.*\
9399
:MetricsTests.Integration_Cassandra_ErrorsRequestTimeouts\
94100
:MetricsTests.Integration_Cassandra_Requests\
95101
:MetricsTests.Integration_Cassandra_StatsShardConnections\
96-
:DisconnectedNullStringApiArgsTest.Integration_Cassandra_SetContactPoints\
97-
:DisconnectedNullStringApiArgsTest.Integration_Cassandra_ConnectKeyspaceNullKeyspace\
98-
:ExecutionProfileTest.Integration_Cassandra_InvalidName\
99-
:ExecutionProfileTest.Integration_Cassandra_RequestTimeout\
100-
:ExecutionProfileTest.Integration_Cassandra_Consistency\
101-
:ExecutionProfileTest.Integration_Cassandra_SerialConsistency\
102-
:ExecutionProfileTest.Integration_Cassandra_LatencyAwareRouting\
103102
:-PreparedTests.Integration_Cassandra_PreparedIDUnchangedDuringReprepare\
104103
:PreparedTests.Integration_Cassandra_FailFastWhenPreparedIDChangesDuringReprepare\
105104
:SchemaMetadataTest.Integration_Cassandra_RegularMetadataNotMarkedVirtual\
106105
:SchemaMetadataTest.Integration_Cassandra_VirtualMetadata\
107106
:HeartbeatTests.Integration_Cassandra_HeartbeatFailed\
108107
:TimestampTests.Integration_Cassandra_MonotonicTimestampGenerator\
108+
:ExecutionProfileTest.Integration_Cassandra_RoundRobin\
109+
:ExecutionProfileTest.Integration_Cassandra_TokenAwareRouting\
110+
:ExecutionProfileTest.Integration_Cassandra_RetryPolicy\
111+
:ExecutionProfileTest.Integration_Cassandra_SpeculativeExecutionPolicy\
112+
:DCExecutionProfileTest.Integration_Cassandra_DCAware\
109113
:ControlConnectionTests.Integration_Cassandra_TopologyChange\
110114
:ControlConnectionTests.Integration_Cassandra_FullOutage\
111115
:ControlConnectionTests.Integration_Cassandra_TerminatedUsingMultipleIoThreadsWithError\

0 commit comments

Comments
 (0)