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

Trace test updates for PYTHON-318

Browse Source
This commit is contained in:
Adam Holmberg
2015-10-14 10:18:23 -05:00
parent 5957a65ec1
commit 385baa1659
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/integration/standard/test_client_warnings.py
View File

@@ -91,7 +91,7 @@ class ClientWarningTests(unittest.TestCase):
future.result() future.result()
self.assertEqual(len(future.warnings), 1) self.assertEqual(len(future.warnings), 1)
self.assertRegexpMatches(future.warnings[0], 'Batch.*exceeding.*') self.assertRegexpMatches(future.warnings[0], 'Batch.*exceeding.*')
self.assertIsNotNone(future._query_trace) self.assertIsNotNone(future.get_query_trace())
def test_warning_with_custom_payload(self): def test_warning_with_custom_payload(self):
""" """
@@ -127,5 +127,5 @@ class ClientWarningTests(unittest.TestCase):
future.result() future.result()
self.assertEqual(len(future.warnings), 1) self.assertEqual(len(future.warnings), 1)
self.assertRegexpMatches(future.warnings[0], 'Batch.*exceeding.*') self.assertRegexpMatches(future.warnings[0], 'Batch.*exceeding.*')
self.assertIsNotNone(future._query_trace) self.assertIsNotNone(future.get_query_trace())
self.assertDictEqual(future.custom_payload, payload) self.assertDictEqual(future.custom_payload, payload)

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

@@ -438,11 +438,11 @@ class ClusterTests(unittest.TestCase):
session = cluster.connect() session = cluster.connect()
def check_trace(trace): def check_trace(trace):
self.assertIsNot(None, trace.request_type) self.assertIsNotNone(trace.request_type)
self.assertIsNot(None, trace.duration) self.assertIsNotNone(trace.duration)
self.assertIsNot(None, trace.started_at) self.assertIsNotNone(trace.started_at)
self.assertIsNot(None, trace.coordinator) self.assertIsNotNone(trace.coordinator)
self.assertIsNot(None, trace.events) self.assertIsNotNone(trace.events)
result = session.execute( "SELECT * FROM system.local", trace=True) result = session.execute( "SELECT * FROM system.local", trace=True)
check_trace(result.get_query_trace()) check_trace(result.get_query_trace())

11
tests/unit/test_resultset.py
View File

@@ -37,7 +37,8 @@ class ResultSetTests(unittest.TestCase):
response_future.result.side_effect = (ResultSet(Mock(), expected[-5:]), ) # ResultSet is iterable, so it must be protected in order to be returned whole by the Mock response_future.result.side_effect = (ResultSet(Mock(), expected[-5:]), ) # ResultSet is iterable, so it must be protected in order to be returned whole by the Mock
rs = ResultSet(response_future, expected[:5]) rs = ResultSet(response_future, expected[:5])
itr = iter(rs) itr = iter(rs)
type(response_future).has_more_pages = PropertyMock(side_effect=(True, False)) # after init to avoid side effects being consumed by init # this is brittle, depends on internal impl details. Would like to find a better way
type(response_future).has_more_pages = PropertyMock(side_effect=(True, True, False)) # after init to avoid side effects being consumed by init
self.assertListEqual(list(itr), expected) self.assertListEqual(list(itr), expected)
def test_list_non_paged(self): def test_list_non_paged(self):
@@ -54,7 +55,8 @@ class ResultSetTests(unittest.TestCase):
response_future = Mock(has_more_pages=True) response_future = Mock(has_more_pages=True)
response_future.result.side_effect = (ResultSet(Mock(), expected[-5:]), ) # ResultSet is iterable, so it must be protected in order to be returned whole by the Mock response_future.result.side_effect = (ResultSet(Mock(), expected[-5:]), ) # ResultSet is iterable, so it must be protected in order to be returned whole by the Mock
rs = ResultSet(response_future, expected[:5]) rs = ResultSet(response_future, expected[:5])
type(response_future).has_more_pages = PropertyMock(side_effect=(True, True, False)) # one True for getitem check/warn, then True, False for two pages # this is brittle, depends on internal impl details. Would like to find a better way
type(response_future).has_more_pages = PropertyMock(side_effect=(True, True, True, False)) # First two True are consumed on check entering list mode
self.assertEqual(rs[9], expected[9]) self.assertEqual(rs[9], expected[9])
self.assertEqual(list(rs), expected) self.assertEqual(list(rs), expected)
@@ -119,7 +121,8 @@ class ResultSetTests(unittest.TestCase):
response_future = Mock(has_more_pages=True) response_future = Mock(has_more_pages=True)
response_future.result.side_effect = (ResultSet(Mock(), expected[-5:]), ) # ResultSet is iterable, so it must be protected in order to be returned whole by the Mock response_future.result.side_effect = (ResultSet(Mock(), expected[-5:]), ) # ResultSet is iterable, so it must be protected in order to be returned whole by the Mock
rs = ResultSet(response_future, expected[:5]) rs = ResultSet(response_future, expected[:5])
type(response_future).has_more_pages = PropertyMock(side_effect=(True, True, False)) # First True is consumed on check entering list mode # this is brittle, depends on internal impl details. Would like to find a better way
type(response_future).has_more_pages = PropertyMock(side_effect=(True, True, True, False)) # First two True are consumed on check entering list mode
# index access before iteration causes list to be materialized # index access before iteration causes list to be materialized
self.assertEqual(rs[0], expected[0]) self.assertEqual(rs[0], expected[0])
self.assertEqual(rs[9], expected[9]) self.assertEqual(rs[9], expected[9])
@@ -146,7 +149,7 @@ class ResultSetTests(unittest.TestCase):
response_future = Mock(has_more_pages=True) response_future = Mock(has_more_pages=True)
response_future.result.side_effect = (ResultSet(Mock(), expected[-5:]), ) # ResultSet is iterable, so it must be protected in order to be returned whole by the Mock response_future.result.side_effect = (ResultSet(Mock(), expected[-5:]), ) # ResultSet is iterable, so it must be protected in order to be returned whole by the Mock
rs = ResultSet(response_future, expected[:5]) rs = ResultSet(response_future, expected[:5])
type(response_future).has_more_pages = PropertyMock(side_effect=(True, True, False)) type(response_future).has_more_pages = PropertyMock(side_effect=(True, True, True, False))
# eq before iteration causes list to be materialized # eq before iteration causes list to be materialized
self.assertEqual(rs, expected) self.assertEqual(rs, expected)