Skip to content

Commit d1e8df4

Browse files
committed
Stop result indexing in test
It is marked to be depricated, we need to stop using it. It also spams following warnings in tests: DeprecationWarning: ResultSet indexing support will be removed in 4.0. Consider using ResultSet.one() to get a single row.
1 parent 1e82fe3 commit d1e8df4

File tree

10 files changed

+69
-69
lines changed

10 files changed

+69
-69
lines changed

tests/integration/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def get_server_versions():
8787

8888
c = TestCluster()
8989
s = c.connect()
90-
row = s.execute('SELECT cql_version, release_version FROM system.local')[0]
90+
row = s.execute('SELECT cql_version, release_version FROM system.local').one()
9191

9292
cass_version = _tuple_version(row.release_version)
9393
cql_version = _tuple_version(row.cql_version)

tests/integration/standard/test_cluster.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ def test_profile_load_balancing(self):
916916
tuple_row.release_version
917917

918918
# make sure original profile is not impacted
919-
self.assertTrue(session.execute(query, execution_profile='node1')[0].release_version)
919+
self.assertTrue(session.execute(query, execution_profile='node1').one().release_version)
920920

921921
def test_setting_lbp_legacy(self):
922922
cluster = TestCluster()
@@ -1390,7 +1390,7 @@ def test_simple_nested(self):
13901390
with cluster.connect() as session:
13911391
self.assertFalse(cluster.is_shutdown)
13921392
self.assertFalse(session.is_shutdown)
1393-
self.assertTrue(session.execute('select release_version from system.local')[0])
1393+
self.assertTrue(session.execute('select release_version from system.local').one())
13941394
self.assertTrue(session.is_shutdown)
13951395
self.assertTrue(cluster.is_shutdown)
13961396

@@ -1408,7 +1408,7 @@ def test_cluster_no_session(self):
14081408
session = cluster.connect()
14091409
self.assertFalse(cluster.is_shutdown)
14101410
self.assertFalse(session.is_shutdown)
1411-
self.assertTrue(session.execute('select release_version from system.local')[0])
1411+
self.assertTrue(session.execute('select release_version from system.local').one())
14121412
self.assertTrue(session.is_shutdown)
14131413
self.assertTrue(cluster.is_shutdown)
14141414

@@ -1428,7 +1428,7 @@ def test_session_no_cluster(self):
14281428
self.assertFalse(cluster.is_shutdown)
14291429
self.assertFalse(session.is_shutdown)
14301430
self.assertFalse(unmanaged_session.is_shutdown)
1431-
self.assertTrue(session.execute('select release_version from system.local')[0])
1431+
self.assertTrue(session.execute('select release_version from system.local').one())
14321432
self.assertTrue(session.is_shutdown)
14331433
self.assertFalse(cluster.is_shutdown)
14341434
self.assertFalse(unmanaged_session.is_shutdown)
@@ -1551,7 +1551,7 @@ def test_valid_protocol_version_beta_options_connect(self):
15511551
cluster = Cluster(protocol_version=cassandra.ProtocolVersion.V6, allow_beta_protocol_version=True)
15521552
session = cluster.connect()
15531553
self.assertEqual(cluster.protocol_version, cassandra.ProtocolVersion.V6)
1554-
self.assertTrue(session.execute("select release_version from system.local")[0])
1554+
self.assertTrue(session.execute("select release_version from system.local").one())
15551555
cluster.shutdown()
15561556

15571557

tests/integration/standard/test_custom_protocol_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def test_custom_raw_row_results_all_types(self):
113113

114114
# verify data
115115
params = get_all_primitive_params(0)
116-
results = session.execute("SELECT {0} FROM alltypes WHERE primkey=0".format(columns_string))[0]
116+
results = session.execute("SELECT {0} FROM alltypes WHERE primkey=0".format(columns_string)).one()
117117
for expected, actual in zip(params, results):
118118
self.assertEqual(actual, expected)
119119
# Ensure we have covered the various primitive types

tests/integration/standard/test_cython_protocol_handlers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,14 +231,14 @@ def test_null_types(self):
231231
table = "%s.%s" % (self.keyspace_name, self.function_table_name)
232232
create_table_with_all_types(table, s, 10)
233233

234-
begin_unset = max(s.execute('select primkey from %s' % (table,))[0]['primkey']) + 1
234+
begin_unset = max(s.execute('select primkey from %s' % (table,)).one()['primkey']) + 1
235235
keys_null = range(begin_unset, begin_unset + 10)
236236

237237
# scatter some emptry rows in here
238238
insert = "insert into %s (primkey) values (%%s)" % (table,)
239239
execute_concurrent_with_args(s, insert, ((k,) for k in keys_null))
240240

241-
result = s.execute("select * from %s" % (table,))[0]
241+
result = s.execute("select * from %s" % (table,)).one()
242242

243243
from numpy.ma import masked, MaskedArray
244244
result_keys = result.pop('primkey')

tests/integration/standard/test_metadata.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1819,14 +1819,14 @@ def test_init_cond(self):
18191819
for init_cond in (-1, 0, 1):
18201820
cql_init = encoder.cql_encode_all_types(init_cond)
18211821
with self.VerifiedAggregate(self, **self.make_aggregate_kwargs('sum_int', 'int', init_cond=cql_init)) as va:
1822-
sum_res = s.execute("SELECT %s(v) AS sum FROM t" % va.function_kwargs['name'])[0].sum
1822+
sum_res = s.execute("SELECT %s(v) AS sum FROM t" % va.function_kwargs['name']).one().sum
18231823
self.assertEqual(sum_res, int(init_cond) + sum(expected_values))
18241824

18251825
# list<text>
18261826
for init_cond in ([], ['1', '2']):
18271827
cql_init = encoder.cql_encode_all_types(init_cond)
18281828
with self.VerifiedAggregate(self, **self.make_aggregate_kwargs('extend_list', 'list<text>', init_cond=cql_init)) as va:
1829-
list_res = s.execute("SELECT %s(v) AS list_res FROM t" % va.function_kwargs['name'])[0].list_res
1829+
list_res = s.execute("SELECT %s(v) AS list_res FROM t" % va.function_kwargs['name']).one().list_res
18301830
self.assertListEqual(list_res[:len(init_cond)], init_cond)
18311831
self.assertEqual(set(i for i in list_res[len(init_cond):]),
18321832
set(str(i) for i in expected_values))
@@ -1837,7 +1837,7 @@ def test_init_cond(self):
18371837
for init_cond in ({}, {1: 2, 3: 4}, {5: 5}):
18381838
cql_init = encoder.cql_encode_all_types(init_cond)
18391839
with self.VerifiedAggregate(self, **self.make_aggregate_kwargs('update_map', 'map<int, int>', init_cond=cql_init)) as va:
1840-
map_res = s.execute("SELECT %s(v) AS map_res FROM t" % va.function_kwargs['name'])[0].map_res
1840+
map_res = s.execute("SELECT %s(v) AS map_res FROM t" % va.function_kwargs['name']).one().map_res
18411841
self.assertDictContainsSubset(expected_map_values, map_res)
18421842
init_not_updated = dict((k, init_cond[k]) for k in set(init_cond) - expected_key_set)
18431843
self.assertDictContainsSubset(init_not_updated, map_res)

tests/integration/standard/test_prepared_statements.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ def _test_updated_conditional(self, session, value):
616616

617617
def check_result_and_metadata(expected):
618618
self.assertEqual(
619-
session.execute(prepared_statement, (value, value, value))[0],
619+
session.execute(prepared_statement, (value, value, value)).one(),
620620
expected
621621
)
622622
self.assertEqual(prepared_statement.result_metadata_id, first_id)

tests/integration/standard/test_routing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def insert_select_token(self, insert, select, key_values):
4848

4949
my_token = s.cluster.metadata.token_map.token_class.from_key(bound.routing_key)
5050

51-
cass_token = s.execute(select, key_values)[0][0]
51+
cass_token = s.execute(select, key_values).one()[0]
5252
token = s.cluster.metadata.token_map.token_class(cass_token)
5353
self.assertEqual(my_token, token)
5454

0 commit comments

Comments
 (0)