openstack/deb-python-cassandra-driver
Code Issues Proposed changes

assertEquals --> assertEqual

Browse Source
This commit is contained in:
Adam Holmberg
2015-02-03 12:28:13 -06:00
parent f35d373550
commit df2009d18d
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/integration/standard/test_query_paging.py
View File

@@ -251,7 +251,7 @@ class QueryPagingTests(unittest.TestCase):
future.add_callbacks(callback=handle_page, callback_args=(future, counter), errback=handle_error)
event.wait()
self.assertEquals(next(counter), 100)
self.assertEqual(next(counter), 100)
# simple statement
future = self.session.execute_async(SimpleStatement("SELECT * FROM test3rf.test"))
@@ -260,7 +260,7 @@ class QueryPagingTests(unittest.TestCase):
future.add_callbacks(callback=handle_page, callback_args=(future, counter), errback=handle_error)
event.wait()
self.assertEquals(next(counter), 100)
self.assertEqual(next(counter), 100)
# prepared statement
future = self.session.execute_async(prepared)
@@ -269,7 +269,7 @@ class QueryPagingTests(unittest.TestCase):
future.add_callbacks(callback=handle_page, callback_args=(future, counter), errback=handle_error)
event.wait()
self.assertEquals(next(counter), 100)
self.assertEqual(next(counter), 100)
def test_concurrent_with_paging(self):
statements_and_params = zip(cycle(["INSERT INTO test3rf.test (k, v) VALUES (%s, 0)"]),
@@ -281,10 +281,10 @@ class QueryPagingTests(unittest.TestCase):
for fetch_size in (2, 3, 7, 10, 99, 100, 101, 10000):
self.session.default_fetch_size = fetch_size
results = execute_concurrent_with_args(self.session, prepared, [None] * 10)
self.assertEquals(10, len(results))
self.assertEqual(10, len(results))
for (success, result) in results:
self.assertTrue(success)
self.assertEquals(100, len(list(result)))
self.assertEqual(100, len(list(result)))
def test_fetch_size(self):
"""

13
tests/integration/standard/test_types.py
View File

@@ -700,16 +700,16 @@ class TypeTests(unittest.TestCase):
s.execute(insert, [(None, None, None, None)])
result = s.execute("SELECT * FROM mytable WHERE k=0")
self.assertEquals((None, None, None, None), result[0].t)
self.assertEqual((None, None, None, None), result[0].t)
read = s.prepare("SELECT * FROM mytable WHERE k=0")
self.assertEquals((None, None, None, None), s.execute(read)[0].t)
self.assertEqual((None, None, None, None), s.execute(read)[0].t)
# also test empty strings where compatible
s.execute(insert, [('', None, None, b'')])
result = s.execute("SELECT * FROM mytable WHERE k=0")
self.assertEquals(('', None, None, b''), result[0].t)
self.assertEquals(('', None, None, b''), s.execute(read)[0].t)
self.assertEqual(('', None, None, b''), result[0].t)
self.assertEqual(('', None, None, b''), s.execute(read)[0].t)
c.shutdown()
@@ -760,8 +760,7 @@ class TypeTests(unittest.TestCase):
map_list map<frozen<list<int>>, frozen<list<int>>>,
map_tuple map<frozen<tuple<int, int>>, frozen<tuple<int>>>,
map_udt map<frozen<%s_nested>, frozen<%s>>,
)"""
% (name, name, name))
)""" % (name, name, name))
validate = partial(self.insert_select_column, s, name)
validate('map_map', OrderedMap([({1: 1, 2: 2}, {3: 3, 4: 4}), ({5: 5, 6: 6}, {7: 7, 8: 8})]))
@@ -769,7 +768,7 @@ class TypeTests(unittest.TestCase):
validate('map_list', OrderedMap([([1, 2], [3, 4]), ([5, 6], [7, 8])]))
validate('map_tuple', OrderedMap([((1, 2), (3,)), ((4, 5), (6,))]))
value = nested_collection_udt({1: 'v1', 2: 'v2'}, (3, 'v3'), [4, 5, 6, 7], set((8,9,10)))
value = nested_collection_udt({1: 'v1', 2: 'v2'}, (3, 'v3'), [4, 5, 6, 7], set((8, 9, 10)))
key = nested_collection_udt_nested(value.m, value.t, value.l, value.s, value)
key2 = nested_collection_udt_nested({3: 'v3'}, value.t, value.l, value.s, value)
validate('map_udt', OrderedMap([(key, value), (key2, value)]))