Commit c2cb8a5

Lorak-mmkdkropachev

authored and

committed

test_response_future: Use util asserts

1 parent c79be1f commit c2cb8a5Copy full SHA for c2cb8a5

File tree

2 files changed

+10

-6

lines changed

tests
- unit
  - test_response_future.py
- util.py

2 files changed

+10

-6

lines changed

`‎tests/unit/test_response_future.py`

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`from cassandra.policies import RetryPolicy, ExponentialBackoffRetryPolicy`
`32`	`32`	`from cassandra.pool import NoConnectionsAvailable`
`33`	`33`	`from cassandra.query import SimpleStatement`
	`34`	`+from tests.util import assertEqual, assertIsInstance`
`34`	`35`
`35`	`36`
`36`	`37`	`class ResponseFutureTests(unittest.TestCase):`
`@@ -442,7 +443,7 @@ def test_callback(self):`
`442`	`443`	`callback.assert_called_once_with([expected_result], arg, **kwargs)`
`443`	`444`
`444`	`445`	`# this should get called immediately now that the result is set`
`445`		`- rf.add_callback(self.assertEqual, [expected_result])`
	`446`	`+ rf.add_callback(assertEqual, [expected_result])`
`446`	`447`
`447`	`448`	`def test_errback(self):`
`448`	`449`	`session = self.make_session()`
`@@ -457,7 +458,7 @@ def test_errback(self):`
`457`	`458`	`rf._query_retries = 1`
`458`	`459`	`rf.send_request()`
`459`	`460`
`460`		`- rf.add_errback(self.assertIsInstance, Exception)`
	`461`	`+ rf.add_errback(assertIsInstance, Exception)`
`461`	`462`
`462`	`463`	`result = Mock(spec=UnavailableErrorMessage, info={"required_replicas":2, "alive_replicas": 1, "consistency": 1})`
`463`	`464`	`result.to_exception.return_value = Exception()`
`@@ -466,7 +467,7 @@ def test_errback(self):`
`466`	`467`	`self.assertRaises(Exception, rf.result)`
`467`	`468`
`468`	`469`	`# this should get called immediately now that the error is set`
`469`		`- rf.add_errback(self.assertIsInstance, Exception)`
	`470`	`+ rf.add_errback(assertIsInstance, Exception)`
`470`	`471`
`471`	`472`	`def test_multiple_callbacks(self):`
`472`	`473`	`session = self.make_session()`
`@@ -537,8 +538,8 @@ def test_add_callbacks(self):`
`537`	`538`	`rf.send_request()`
`538`	`539`
`539`	`540`	`rf.add_callbacks(`
`540`		`- callback=self.assertEqual, callback_args=([{'col': 'val'}],),`
`541`		`- errback=self.assertIsInstance, errback_args=(Exception,))`
	`541`	`+ callback=assertEqual, callback_args=([{'col': 'val'}],),`
	`542`	`+ errback=assertIsInstance, errback_args=(Exception,))`
`542`	`543`
`543`	`544`	`result = Mock(spec=UnavailableErrorMessage,`
`544`	`545`	`info={"required_replicas":2, "alive_replicas": 1, "consistency": 1})`
`@@ -556,7 +557,7 @@ def test_add_callbacks(self):`
`556`	`557`	`kwargs = {'one': 1, 'two': 2}`
`557`	`558`	`rf.add_callbacks(`
`558`	`559`	`callback=callback, callback_args=(arg,), callback_kwargs=kwargs,`
`559`		`- errback=self.assertIsInstance, errback_args=(Exception,))`
	`560`	`+ errback=assertIsInstance, errback_args=(Exception,))`
`560`	`561`
`561`	`562`	`rf._set_result(None, None, None, self.make_mock_response(expected_result[0], expected_result[1]))`
`562`	`563`	`assert rf.result()[0] == expected_result`

`‎tests/util.py`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -108,3 +108,6 @@ def assert_startswith_diff(text, prefix):`
`108`	`108`	`'EXPECTED', 'RECEIVED',`
`109`	`109`	`lineterm=''))`
`110`	`110`	`pytest.fail(diff_string)`
	`111`	`+`
	`112`	`+def assertIsInstance(a, b):`
	`113`	`+ assert isinstance(a, b)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit c2cb8a5

File tree

2 files changed

2 files changed

`‎tests/unit/test_response_future.py`

`‎tests/util.py`

0 commit comments