Skip to content

Commit e24acab

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 dea4904 commit e24acab

14 files changed

+159
-157
lines changed

tests/integration/__init__.py

+1-1
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/cqlengine/statements/test_base_statement.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def tearDownClass(cls):
6161
def _verify_statement(self, original):
6262
st = SelectStatement(self.table_name)
6363
result = execute(st)
64-
response = result[0]
64+
response = result.one()
6565

6666
for assignment in original.assignments:
6767
self.assertEqual(response[assignment.field], assignment.value)

tests/integration/cqlengine/test_ttl.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def get_default_ttl(self, table_name):
169169
except InvalidRequest:
170170
default_ttl = session.execute("SELECT default_time_to_live FROM system.schema_columnfamilies "
171171
"WHERE keyspace_name = 'cqlengine_test' AND columnfamily_name = '{0}'".format(table_name))
172-
return default_ttl[0]['default_time_to_live']
172+
return default_ttl.one()['default_time_to_live']
173173

174174
def test_default_ttl_not_set(self):
175175
session = get_session()

tests/integration/standard/test_cluster.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@ def test_profile_load_balancing(self):
899899

900900
# use a copied instance and override the row factory
901901
# assert last returned value can be accessed as a namedtuple so we can prove something different
902-
named_tuple_row = rs[0]
902+
named_tuple_row = rs.one()
903903
self.assertIsInstance(named_tuple_row, tuple)
904904
self.assertTrue(named_tuple_row.release_version)
905905

@@ -910,13 +910,13 @@ def test_profile_load_balancing(self):
910910
rs = session.execute(query, execution_profile=tmp_profile)
911911
queried_hosts.add(rs.response_future._current_host)
912912
self.assertEqual(queried_hosts, expected_hosts)
913-
tuple_row = rs[0]
913+
tuple_row = rs.one()
914914
self.assertIsInstance(tuple_row, tuple)
915915
with self.assertRaises(AttributeError):
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

+4-4
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,20 @@ def test_custom_raw_uuid_row_results(self):
7070
session = cluster.connect(keyspace="custserdes")
7171

7272
result = session.execute("SELECT schema_version FROM system.local")
73-
uuid_type = result[0][0]
73+
uuid_type = result.one()[0]
7474
self.assertEqual(type(uuid_type), uuid.UUID)
7575

7676
# use our custom protocol handlder
7777
session.client_protocol_handler = CustomTestRawRowType
7878
result_set = session.execute("SELECT schema_version FROM system.local")
79-
raw_value = result_set[0][0]
79+
raw_value = result_set.one()[0]
8080
self.assertTrue(isinstance(raw_value, bytes))
8181
self.assertEqual(len(raw_value), 16)
8282

8383
# Ensure that we get normal uuid back when we re-connect
8484
session.client_protocol_handler = ProtocolHandler
8585
result_set = session.execute("SELECT schema_version FROM system.local")
86-
uuid_type = result_set[0][0]
86+
uuid_type = result_set.one()[0]
8787
self.assertEqual(type(uuid_type), uuid.UUID)
8888
cluster.shutdown()
8989

@@ -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

+2-2
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

+5-5
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ def test_schema_metadata_disable(self):
163163
query = "SELECT * FROM system.local"
164164
no_schema_rs = no_schema_session.execute(query)
165165
no_token_rs = no_token_session.execute(query)
166-
self.assertIsNotNone(no_schema_rs[0])
167-
self.assertIsNotNone(no_token_rs[0])
166+
self.assertIsNotNone(no_schema_rs.one())
167+
self.assertIsNotNone(no_token_rs.one())
168168
no_schema.shutdown()
169169
no_token.shutdown()
170170

@@ -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

+7-7
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ def test_none_values(self):
229229

230230
bound = prepared.bind((1,))
231231
results = self.session.execute(bound)
232-
self.assertEqual(results[0].v, None)
232+
self.assertEqual(results.one().v, None)
233233

234234
def test_unset_values(self):
235235
"""
@@ -272,7 +272,7 @@ def test_unset_values(self):
272272
for params, expected in bind_expected:
273273
self.session.execute(insert, params)
274274
results = self.session.execute(select, (0,))
275-
self.assertEqual(results[0], expected)
275+
self.assertEqual(results.one(), expected)
276276

277277
self.assertRaises(ValueError, self.session.execute, select, (UNSET_VALUE, 0, 0))
278278

@@ -297,7 +297,7 @@ def test_no_meta(self):
297297
bound = prepared.bind(None)
298298
bound.consistency_level = ConsistencyLevel.ALL
299299
results = self.session.execute(bound)
300-
self.assertEqual(results[0].v, 0)
300+
self.assertEqual(results.one().v, 0)
301301

302302
def test_none_values_dicts(self):
303303
"""
@@ -322,7 +322,7 @@ def test_none_values_dicts(self):
322322

323323
bound = prepared.bind({'k': 1})
324324
results = self.session.execute(bound)
325-
self.assertEqual(results[0].v, None)
325+
self.assertEqual(results.one().v, None)
326326

327327
def test_async_binding(self):
328328
"""
@@ -346,7 +346,7 @@ def test_async_binding(self):
346346

347347
future = self.session.execute_async(prepared, (873,))
348348
results = future.result()
349-
self.assertEqual(results[0].v, None)
349+
self.assertEqual(results.one().v, None)
350350

351351
def test_async_binding_dicts(self):
352352
"""
@@ -369,7 +369,7 @@ def test_async_binding_dicts(self):
369369

370370
future = self.session.execute_async(prepared, {'k': 873})
371371
results = future.result()
372-
self.assertEqual(results[0].v, None)
372+
self.assertEqual(results.one().v, None)
373373

374374
def test_raise_error_on_prepared_statement_execution_dropped_table(self):
375375
"""
@@ -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)

0 commit comments

Comments
 (0)