From 017f4842859d58ce32e74ad470ed619c5a8922df Mon Sep 17 00:00:00 2001 From: Mark Roberts Date: Tue, 18 Mar 2014 20:49:10 -0700 Subject: [PATCH] Fix py26 compatibility issue, add mock to tox --- test/test_unit.py | 32 +++++++++++++++----------------- tox.ini | 4 +++- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/test/test_unit.py b/test/test_unit.py index 47ec561a0..2d769fb7f 100644 --- a/test/test_unit.py +++ b/test/test_unit.py @@ -465,18 +465,17 @@ def mock_get_conn(host, port): 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 @@ def mock_get_conn(host, port): 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') diff --git a/tox.ini b/tox.ini index f41911c62..0077c4d87 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,9 @@ [tox] envlist = py26, py27 [testenv] -deps = pytest +deps = + pytest + mock commands = py.test --basetemp={envtmpdir} [] setenv = PROJECT_ROOT = {toxinidir}