diff options
author | Mark Roberts <markroberts@kixeye.com> | 2014-03-18 20:49:10 -0700 |
---|---|---|
committer | Mark Roberts <markroberts@kixeye.com> | 2014-03-18 20:49:10 -0700 |
commit | 017f4842859d58ce32e74ad470ed619c5a8922df (patch) | |
tree | f5d6ebd06e2704b6b21f8bbf1585240447516534 /test | |
parent | 19646b1f1f9fae38c3075a9a56b8e7a9d395ff8e (diff) | |
download | kafka-python-017f4842859d58ce32e74ad470ed619c5a8922df.tar.gz |
Fix py26 compatibility issue, add mock to tox
Diffstat (limited to 'test')
-rw-r--r-- | test/test_unit.py | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/test/test_unit.py b/test/test_unit.py index 47ec561..2d769fb 100644 --- a/test/test_unit.py +++ b/test/test_unit.py @@ -465,18 +465,17 @@ class TestKafkaClient(unittest.TestCase): return mocked_conns[(host, port)] # patch to avoid making requests before we want it - with patch.object(KafkaClient, 'load_metadata_for_topics'), \ - patch.object(KafkaClient, '_get_conn', side_effect=mock_get_conn): - - client = KafkaClient(hosts=['kafka01:9092', 'kafka02:9092']) + with patch.object(KafkaClient, 'load_metadata_for_topics'): + with patch.object(KafkaClient, '_get_conn', side_effect=mock_get_conn): + client = KafkaClient(hosts=['kafka01:9092', 'kafka02:9092']) - self.assertRaises( - KafkaUnavailableError, - client._send_broker_unaware_request, - 1, 'fake request') + self.assertRaises( + KafkaUnavailableError, + client._send_broker_unaware_request, + 1, 'fake request') - for key, conn in mocked_conns.iteritems(): - conn.send.assert_called_with(1, 'fake request') + for key, conn in mocked_conns.iteritems(): + conn.send.assert_called_with(1, 'fake request') def test_send_broker_unaware_request(self): 'Tests that call works when at least one of the host is available' @@ -495,15 +494,14 @@ class TestKafkaClient(unittest.TestCase): return mocked_conns[(host, port)] # patch to avoid making requests before we want it - with patch.object(KafkaClient, 'load_metadata_for_topics'), \ - patch.object(KafkaClient, '_get_conn', side_effect=mock_get_conn): - - client = KafkaClient(hosts='kafka01:9092,kafka02:9092') + with patch.object(KafkaClient, 'load_metadata_for_topics'): + with patch.object(KafkaClient, '_get_conn', side_effect=mock_get_conn): + client = KafkaClient(hosts='kafka01:9092,kafka02:9092') - resp = client._send_broker_unaware_request(1, 'fake request') + resp = client._send_broker_unaware_request(1, 'fake request') - self.assertEqual('valid response', resp) - mocked_conns[('kafka02', 9092)].recv.assert_called_with(1) + self.assertEqual('valid response', resp) + mocked_conns[('kafka02', 9092)].recv.assert_called_with(1) @patch('kafka.client.KafkaConnection') @patch('kafka.client.KafkaProtocol') |