Skip to content

Commit 333269d

Browse files
Orenef11fruch
Orenef11
authored and
fruch
committed
fix(tests/integration/standard): Removing skip marks
1 parent ccf60a6 commit 333269d

11 files changed

Lines changed: 26 additions & 71 deletions

‎tests/integration/standard/test_authentication_misconfiguration.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
from tests.integration import USE_CASS_EXTERNAL, use_cluster, TestCluster
1818

1919

20-
@unittest.skip('Failing with scylla')
2120
class MisconfiguredAuthenticationTests(unittest.TestCase):
2221
""" One node (not the contact point) has password auth. The rest of the nodes have no auth """
2322
# TODO: Fix ccm to apply following options to scylla.yaml

‎tests/integration/standard/test_client_warnings.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ def setup_module():
2727
use_singledc()
2828

2929

30-
@unittest.skip('Failing with scylla')
30+
# Failing with scylla because there is no warning message when changing the value of 'batch_size_warn_threshold_in_kb'
31+
# config")
32+
@unittest.expectedFailure
3133
class ClientWarningTests(unittest.TestCase):
3234

3335
@classmethod

‎tests/integration/standard/test_cluster.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,8 @@ def test_protocol_negotiation(self):
276276

277277
cluster.shutdown()
278278

279-
@unittest.skip('Failing with scylla')
279+
# "Failing with scylla because there is option to create a cluster with 'lower bound' protocol
280+
@unittest.expectedFailure
280281
def test_invalid_protocol_negotation(self):
281282
"""
282283
Test for protocol negotiation when explicit versions are set
@@ -1128,7 +1129,6 @@ def test_execute_query_timeout(self):
11281129
else:
11291130
raise Exception("session.execute didn't time out in {0} tries".format(max_retry_count))
11301131

1131-
@unittest.skip('Failing with scylla')
11321132
def test_replicas_are_queried(self):
11331133
"""
11341134
Test that replicas are queried first for TokenAwarePolicy. A table with RF 1
@@ -1185,9 +1185,10 @@ def test_replicas_are_queried(self):
11851185

11861186
session.execute('''DROP TABLE test1rf.table_with_big_key''')
11871187

1188-
@unittest.skip
11891188
@greaterthanorequalcass30
11901189
@lessthanorequalcass40
1190+
# The scylla failed because 'Unknown identifier column1'
1191+
@unittest.expectedFailure
11911192
def test_compact_option(self):
11921193
"""
11931194
Test the driver can connect with the no_compact option and the results
@@ -1497,7 +1498,6 @@ def test_invalid_protocol_version_beta_option(self):
14971498
except Exception as e:
14981499
self.fail("Unexpected error encountered {0}".format(e.message))
14991500

1500-
@unittest.skip('Failing with scylla')
15011501
@protocolv5
15021502
def test_valid_protocol_version_beta_options_connect(self):
15031503
"""
@@ -1517,6 +1517,7 @@ def test_valid_protocol_version_beta_options_connect(self):
15171517

15181518

15191519
class DeprecationWarningTest(unittest.TestCase):
1520+
@unittest.expectedFailure
15201521
def test_deprecation_warnings_legacy_parameters(self):
15211522
"""
15221523
Tests the deprecation warning has been added when using
@@ -1552,7 +1553,7 @@ def test_deprecation_warnings_meta_refreshed(self):
15521553
self.assertIn("Cluster.set_meta_refresh_enabled is deprecated and will be removed in 4.0.",
15531554
str(w[0].message))
15541555

1555-
@unittest.skip('Failing with scylla')
1556+
@unittest.expectedFailure
15561557
def test_deprecation_warning_default_consistency_level(self):
15571558
"""
15581559
Tests the deprecation warning has been added when enabling

‎tests/integration/standard/test_custom_payload.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ def tearDown(self):
4545

4646
self.cluster.shutdown()
4747

48-
@unittest.skip('Failing with scylla')
48+
# Scylla error: 'truncated frame: expected 65540 bytes, length is 64'
49+
@unittest.expectedFailure
4950
def test_custom_query_basic(self):
5051
"""
5152
Test to validate that custom payloads work with simple queries
@@ -68,7 +69,8 @@ def test_custom_query_basic(self):
6869
# Validate that various types of custom payloads are sent and received okay
6970
self.validate_various_custom_payloads(statement=statement)
7071

71-
@unittest.skip('Failing with scylla')
72+
# Scylla error: 'Invalid query kind in BATCH messages. Must be 0 or 1 but got 4'"
73+
@unittest.expectedFailure
7274
def test_custom_query_batching(self):
7375
"""
7476
Test to validate that custom payloads work with batch queries
@@ -93,7 +95,9 @@ def test_custom_query_batching(self):
9395
# Validate that various types of custom payloads are sent and received okay
9496
self.validate_various_custom_payloads(statement=batch)
9597

96-
@unittest.skip('Failing with scylla')
98+
# Scylla error: 'Got different query ID in server response (b'\x00') than we had before
99+
# (b'\x84P\xd0K0\xe2=\x11\xba\x02\x16W\xfatN\xf1')'")
100+
@unittest.expectedFailure
97101
def test_custom_query_prepared(self):
98102
"""
99103
Test to validate that custom payloads work with prepared queries

‎tests/integration/standard/test_custom_protocol_handler.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ def test_custom_raw_row_results_all_types(self):
124124
self.assertEqual(len(CustomResultMessageTracked.checked_rev_row_set), len(PRIMITIVE_DATATYPES)-1)
125125
cluster.shutdown()
126126

127-
@unittest.skip('Failing with scylla')
128127
@greaterthanorequalcass31
128+
@unittest.expectedFailure
129129
def test_protocol_divergence_v5_fail_by_continuous_paging(self):
130130
"""
131131
Test to validate that V5 and DSE_V1 diverge. ContinuousPagingOptions is not supported by V5
@@ -171,8 +171,8 @@ def test_protocol_divergence_v4_fail_by_flag_uses_int(self):
171171
self._protocol_divergence_fail_by_flag_uses_int(ProtocolVersion.V4, uses_int_query_flag=False,
172172
int_flag=True)
173173

174-
@unittest.skip('Failing with scylla')
175174
@greaterthanorequalcass3_10
175+
@unittest.expectedFailure
176176
def test_protocol_v5_uses_flag_int(self):
177177
"""
178178
Test to validate that the _PAGE_SIZE_FLAG is treated correctly using write_uint for V5
@@ -198,8 +198,8 @@ def test_protocol_dsev1_uses_flag_int(self):
198198
self._protocol_divergence_fail_by_flag_uses_int(ProtocolVersion.DSE_V1, uses_int_query_flag=True,
199199
int_flag=True)
200200

201-
@unittest.skip('Failing with scylla')
202201
@greaterthanorequalcass3_10
202+
@unittest.expectedFailure
203203
def test_protocol_divergence_v5_fail_by_flag_uses_int(self):
204204
"""
205205
Test to validate that the _PAGE_SIZE_FLAG is treated correctly using write_uint for V5

‎tests/integration/standard/test_metadata.py‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ def test_basic_table_meta_properties(self):
247247

248248
self.check_create_statement(tablemeta, create_statement)
249249

250-
@unittest.skip('Failing with scylla')
251250
def test_compound_primary_keys(self):
252251
create_statement = self.make_create_statement(["a"], ["b"], ["c"])
253252
create_statement += " WITH CLUSTERING ORDER BY (b ASC)"
@@ -260,7 +259,6 @@ def test_compound_primary_keys(self):
260259

261260
self.check_create_statement(tablemeta, create_statement)
262261

263-
@unittest.skip('Failing with scylla')
264262
def test_compound_primary_keys_protected(self):
265263
create_statement = self.make_create_statement(["Aa"], ["Bb"], ["Cc"])
266264
create_statement += ' WITH CLUSTERING ORDER BY ("Bb" ASC)'
@@ -273,7 +271,6 @@ def test_compound_primary_keys_protected(self):
273271

274272
self.check_create_statement(tablemeta, create_statement)
275273

276-
@unittest.skip('Failing with scylla')
277274
def test_compound_primary_keys_more_columns(self):
278275
create_statement = self.make_create_statement(["a"], ["b", "c"], ["d", "e", "f"])
279276
create_statement += " WITH CLUSTERING ORDER BY (b ASC, c ASC)"
@@ -311,7 +308,6 @@ def test_composite_in_compound_primary_key(self):
311308

312309
self.check_create_statement(tablemeta, create_statement)
313310

314-
@unittest.skip('Failing with scylla')
315311
def test_compound_primary_keys_compact(self):
316312
create_statement = self.make_create_statement(["a"], ["b"], ["c"])
317313
create_statement += " WITH CLUSTERING ORDER BY (b ASC)"
@@ -346,7 +342,6 @@ def test_cluster_column_ordering_reversed_metadata(self):
346342
c_column = tablemeta.columns['c']
347343
self.assertTrue(c_column.is_reversed)
348344

349-
@unittest.skip('Failing with scylla')
350345
def test_compound_primary_keys_more_columns_compact(self):
351346
create_statement = self.make_create_statement(["a"], ["b", "c"], ["d"])
352347
create_statement += " WITH CLUSTERING ORDER BY (b ASC, c ASC)"
@@ -411,7 +406,6 @@ def test_compound_primary_keys_ordering(self):
411406
tablemeta = self.get_table_metadata()
412407
self.check_create_statement(tablemeta, create_statement)
413408

414-
@unittest.skip('Failing with scylla')
415409
def test_compound_primary_keys_more_columns_ordering(self):
416410
create_statement = self.make_create_statement(["a"], ["b", "c"], ["d", "e", "f"])
417411
create_statement += " WITH CLUSTERING ORDER BY (b DESC, c ASC)"
@@ -444,7 +438,6 @@ def test_dense_compact_storage(self):
444438
tablemeta = self.get_table_metadata()
445439
self.check_create_statement(tablemeta, create_statement)
446440

447-
@unittest.skip('Failing with scylla')
448441
def test_counter(self):
449442
create_statement = (
450443
"CREATE TABLE {keyspace}.{table} ("
@@ -478,7 +471,6 @@ def test_counter_with_dense_compact_storage(self):
478471
tablemeta = self.get_table_metadata()
479472
self.check_create_statement(tablemeta, create_statement)
480473

481-
@unittest.skip('Failing with scylla')
482474
def test_indexes(self):
483475
create_statement = self.make_create_statement(["a"], ["b", "c"], ["d", "e", "f"])
484476
create_statement += " WITH CLUSTERING ORDER BY (b ASC, c ASC)"
@@ -503,7 +495,6 @@ def test_indexes(self):
503495
self.assertIn('CREATE INDEX d_index', statement)
504496
self.assertIn('CREATE INDEX e_index', statement)
505497

506-
@unittest.skip('Failing with scylla')
507498
@greaterthancass21
508499
def test_collection_indexes(self):
509500

@@ -534,7 +525,6 @@ def test_collection_indexes(self):
534525
tablemeta = self.get_table_metadata()
535526
self.assertIn('(full(b))', tablemeta.export_as_string())
536527

537-
@unittest.skip('Failing with scylla')
538528
def test_compression_disabled(self):
539529
create_statement = self.make_create_statement(["a"], ["b"], ["c"])
540530
create_statement += " WITH compression = {}"
@@ -543,7 +533,6 @@ def test_compression_disabled(self):
543533
expected = "compression = {}" if CASSANDRA_VERSION < Version("3.0") else "compression = {'enabled': 'false'}"
544534
self.assertIn(expected, tablemeta.export_as_string())
545535

546-
@unittest.skip('Failing with scylla')
547536
def test_non_size_tiered_compaction(self):
548537
"""
549538
test options for non-size-tiered compaction strategy
@@ -570,7 +559,6 @@ def test_non_size_tiered_compaction(self):
570559
self.assertNotIn("min_threshold", cql)
571560
self.assertNotIn("max_threshold", cql)
572561

573-
@unittest.skip('Failing with scylla')
574562
def test_refresh_schema_metadata(self):
575563
"""
576564
test for synchronously refreshing all cluster metadata
@@ -655,7 +643,6 @@ def test_refresh_schema_metadata(self):
655643

656644
cluster2.shutdown()
657645

658-
@unittest.skip('Failing with scylla')
659646
def test_refresh_keyspace_metadata(self):
660647
"""
661648
test for synchronously refreshing keyspace metadata
@@ -684,7 +671,6 @@ def test_refresh_keyspace_metadata(self):
684671

685672
cluster2.shutdown()
686673

687-
@unittest.skip('Failing with scylla')
688674
def test_refresh_table_metadata(self):
689675
"""
690676
test for synchronously refreshing table metadata
@@ -717,7 +703,6 @@ def test_refresh_table_metadata(self):
717703

718704
cluster2.shutdown()
719705

720-
@unittest.skip('Failing with scylla')
721706
@greaterthanorequalcass30
722707
def test_refresh_metadata_for_mv(self):
723708
"""
@@ -779,7 +764,6 @@ def test_refresh_metadata_for_mv(self):
779764
finally:
780765
cluster3.shutdown()
781766

782-
@unittest.skip('Failing with scylla')
783767
def test_refresh_user_type_metadata(self):
784768
"""
785769
test for synchronously refreshing UDT metadata in keyspace
@@ -847,7 +831,7 @@ def test_refresh_user_type_metadata_proto_2(self):
847831
self.assertEqual(cluster.metadata.keyspaces[self.keyspace_name].user_types, {})
848832
cluster.shutdown()
849833

850-
@unittest.skip('Failing with scylla')
834+
851835
def test_refresh_user_function_metadata(self):
852836
"""
853837
test for synchronously refreshing UDF metadata in keyspace
@@ -884,7 +868,6 @@ def test_refresh_user_function_metadata(self):
884868

885869
cluster2.shutdown()
886870

887-
@unittest.skip('Failing with scylla')
888871
def test_refresh_user_aggregate_metadata(self):
889872
"""
890873
test for synchronously refreshing UDA metadata in keyspace
@@ -927,7 +910,6 @@ def test_refresh_user_aggregate_metadata(self):
927910

928911
cluster2.shutdown()
929912

930-
@unittest.skip('Failing with scylla')
931913
@greaterthanorequalcass30
932914
def test_multiple_indices(self):
933915
"""
@@ -961,7 +943,6 @@ def test_multiple_indices(self):
961943
self.assertEqual(index_2.index_options["target"], "keys(b)")
962944
self.assertEqual(index_2.keyspace_name, "schemametadatatests")
963945

964-
@unittest.skip('Failing with scylla')
965946
@greaterthanorequalcass30
966947
def test_table_extensions(self):
967948
s = self.session
@@ -1181,7 +1162,6 @@ def test_export_keyspace_schema_udts(self):
11811162

11821163
cluster.shutdown()
11831164

1184-
@unittest.skip('Failing with scylla')
11851165
@greaterthancass21
11861166
def test_case_sensitivity(self):
11871167
"""
@@ -1251,7 +1231,6 @@ def test_already_exists_exceptions(self):
12511231
self.assertRaises(AlreadyExists, session.execute, ddl % (ksname, cfname))
12521232
cluster.shutdown()
12531233

1254-
@unittest.skip('Failing with scylla')
12551234
@local
12561235
def test_replicas(self):
12571236
"""
@@ -1325,7 +1304,6 @@ def tearDown(self):
13251304
self.session.execute('DROP KEYSPACE %s' % name)
13261305
self.cluster.shutdown()
13271306

1328-
@unittest.skip('Failing with scylla')
13291307
def test_keyspace_alter(self):
13301308
"""
13311309
Table info is preserved upon keyspace alter:
@@ -1535,7 +1513,6 @@ def make_function_kwargs(self, called_on_null=True):
15351513
'monotonic': False,
15361514
'monotonic_on': []}
15371515

1538-
@unittest.skip('Failing with scylla')
15391516
def test_functions_after_udt(self):
15401517
"""
15411518
Test to to ensure functions come after UDTs in in keyspace dump
@@ -1571,7 +1548,6 @@ def test_functions_after_udt(self):
15711548
self.assertNotIn(-1, (type_idx, func_idx), "TYPE or FUNCTION not found in keyspace_cql: " + keyspace_cql)
15721549
self.assertGreater(func_idx, type_idx)
15731550

1574-
@unittest.skip('Failing with scylla')
15751551
def test_function_same_name_diff_types(self):
15761552
"""
15771553
Test to verify to that functions with different signatures are differentiated in metadata
@@ -1601,7 +1577,6 @@ def test_function_same_name_diff_types(self):
16011577
self.assertEqual(len(functions), 2)
16021578
self.assertNotEqual(functions[0].argument_types, functions[1].argument_types)
16031579

1604-
@unittest.skip('Failing with scylla')
16051580
def test_function_no_parameters(self):
16061581
"""
16071582
Test to verify CQL output for functions with zero parameters
@@ -1623,7 +1598,6 @@ def test_function_no_parameters(self):
16231598
fn_meta = self.keyspace_function_meta[vf.signature]
16241599
self.assertRegexpMatches(fn_meta.as_cql_query(), "CREATE FUNCTION.*%s\(\) .*" % kwargs['name'])
16251600

1626-
@unittest.skip('Failing with scylla')
16271601
def test_functions_follow_keyspace_alter(self):
16281602
"""
16291603
Test to verify to that functions maintain equality after a keyspace is altered
@@ -1651,7 +1625,6 @@ def test_functions_follow_keyspace_alter(self):
16511625
finally:
16521626
self.session.execute('ALTER KEYSPACE %s WITH durable_writes = true' % self.keyspace_name)
16531627

1654-
@unittest.skip('Failing with scylla')
16551628
def test_function_cql_called_on_null(self):
16561629
"""
16571630
Test to verify to that that called on null argument is honored on function creation.
@@ -1679,7 +1652,6 @@ def test_function_cql_called_on_null(self):
16791652
self.assertRegexpMatches(fn_meta.as_cql_query(), "CREATE FUNCTION.*\) RETURNS NULL ON NULL INPUT RETURNS .*")
16801653

16811654

1682-
@unittest.skip('Failing with scylla')
16831655
class AggregateMetadata(FunctionTest):
16841656

16851657
@classmethod
@@ -1992,7 +1964,6 @@ def test_bad_user_type(self):
19921964
self.assertIs(m._exc_info[0], self.BadMetaException)
19931965
self.assertIn("/*\nWarning:", m.export_as_string())
19941966

1995-
@unittest.skip('Failing with scylla')
19961967
@greaterthancass21
19971968
def test_bad_user_function(self):
19981969
self.session.execute("""CREATE FUNCTION IF NOT EXISTS %s (key int, val int)
@@ -2011,7 +1982,6 @@ def test_bad_user_function(self):
20111982
self.assertIs(m._exc_info[0], self.BadMetaException)
20121983
self.assertIn("/*\nWarning:", m.export_as_string())
20131984

2014-
@unittest.skip('Failing with scylla')
20151985
@greaterthancass21
20161986
def test_bad_user_aggregate(self):
20171987
self.session.execute("""CREATE FUNCTION IF NOT EXISTS sum_int (key int, val int)
@@ -2033,7 +2003,6 @@ def test_bad_user_aggregate(self):
20332003

20342004
class DynamicCompositeTypeTest(BasicSharedKeyspaceUnitTestCase):
20352005

2036-
@unittest.skip('Failing with scylla')
20372006
def test_dct_alias(self):
20382007
"""
20392008
Tests to make sure DCT's have correct string formatting

0 commit comments

Comments
 (0)