Skip to content

Commit a35e549

Browse files
committed
style fixes in metadata integration tests
1 parent 8d9fb39 commit a35e549

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

tests/integration/standard/test_metadata.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
from cassandra.cluster import Cluster
3030
from cassandra.encoder import Encoder
31-
from cassandra.metadata import (IndexMetadata, Token, murmur3, Function, Aggregate, protect_name, protect_names,
31+
from cassandra.metadata import (IndexMetadata, Token, murmur3, Function, Aggregate, protect_name, protect_names,
3232
RegisteredTableExtension, _RegisteredExtensionType, get_schema_parser,
3333
group_keys_by_replica, NO_VALID_REPLICA)
3434

@@ -40,6 +40,7 @@
4040

4141
from tests.integration import greaterthancass21
4242

43+
4344
def setup_module():
4445
use_singledc()
4546

@@ -79,11 +80,12 @@ def test_host_release_version(self):
7980
for host in self.cluster.metadata.all_hosts():
8081
self.assertTrue(host.release_version.startswith(CASSANDRA_VERSION.base_version))
8182

83+
8284
@local
8385
class MetaDataRemovalTest(unittest.TestCase):
8486

8587
def setUp(self):
86-
self.cluster = Cluster(protocol_version=PROTOCOL_VERSION, contact_points=['127.0.0.1','127.0.0.2', '127.0.0.3', '126.0.0.186'])
88+
self.cluster = Cluster(protocol_version=PROTOCOL_VERSION, contact_points=['127.0.0.1', '127.0.0.2', '127.0.0.3', '126.0.0.186'])
8789
self.cluster.connect()
8890

8991
def tearDown(self):
@@ -1912,7 +1914,10 @@ def test_dct_alias(self):
19121914
dct_table = self.cluster.metadata.keyspaces.get(self.ks_name).tables.get(self.function_table_name)
19131915

19141916
# Format can very slightly between versions, strip out whitespace for consistency sake
1915-
self.assertTrue("c1'org.apache.cassandra.db.marshal.DynamicCompositeType(s=>org.apache.cassandra.db.marshal.UTF8Type,i=>org.apache.cassandra.db.marshal.Int32Type)'" in dct_table.as_cql_query().replace(" ", ""))
1917+
self.assertTrue("c1'org.apache.cassandra.db.marshal.DynamicCompositeType("
1918+
"s=>org.apache.cassandra.db.marshal.UTF8Type,"
1919+
"i=>org.apache.cassandra.db.marshal.Int32Type)'"
1920+
in dct_table.as_cql_query().replace(" ", ""))
19161921

19171922

19181923
@greaterthanorequalcass30
@@ -1963,7 +1968,7 @@ def test_materialized_view_metadata_alter(self):
19631968
19641969
@test_category metadata
19651970
"""
1966-
self.assertIn("SizeTieredCompactionStrategy", self.cluster.metadata.keyspaces[self.keyspace_name].tables[self.function_table_name].views["mv1"].options["compaction"]["class"] )
1971+
self.assertIn("SizeTieredCompactionStrategy", self.cluster.metadata.keyspaces[self.keyspace_name].tables[self.function_table_name].views["mv1"].options["compaction"]["class"])
19671972

19681973
self.session.execute("ALTER MATERIALIZED VIEW {0}.mv1 WITH compaction = {{ 'class' : 'LeveledCompactionStrategy' }}".format(self.keyspace_name))
19691974
self.assertIn("LeveledCompactionStrategy", self.cluster.metadata.keyspaces[self.keyspace_name].tables[self.function_table_name].views["mv1"].options["compaction"]["class"])
@@ -2295,6 +2300,7 @@ def test_metadata_with_quoted_identifiers(self):
22952300
self.assertIsNotNone(value_column)
22962301
self.assertEqual(value_column.name, 'the Value')
22972302

2303+
22982304
class GroupPerHost(BasicSharedKeyspaceUnitTestCase):
22992305
@classmethod
23002306
def setUpClass(cls):
@@ -2339,5 +2345,5 @@ def _assert_group_keys_by_host(self, keys, table_name, stmt):
23392345
for key in keys:
23402346
routing_key = prepared_stmt.bind(key).routing_key
23412347
hosts = self.cluster.metadata.get_replicas(self.ks_name, routing_key)
2342-
self.assertEqual(1, len(hosts)) # RF is 1 for this keyspace
2348+
self.assertEqual(1, len(hosts)) # RF is 1 for this keyspace
23432349
self.assertIn(key, keys_per_host[hosts[0]])

0 commit comments

Comments
 (0)