openstack/deb-python-kafka
Code Issues Proposed changes

Fix py26 compatibility issue, add mock to tox

Browse Source
This commit is contained in:
Mark Roberts
2014-03-18 20:49:10 -07:00
parent 19646b1f1f
commit 017f484285
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test/test_unit.py
View File

@@ -465,18 +465,17 @@ class TestKafkaClient(unittest.TestCase):
return mocked_conns[(host, port)] return mocked_conns[(host, port)]
# patch to avoid making requests before we want it # patch to avoid making requests before we want it
with patch.object(KafkaClient, 'load_metadata_for_topics'), \ with patch.object(KafkaClient, 'load_metadata_for_topics'):
patch.object(KafkaClient, '_get_conn', side_effect=mock_get_conn): with patch.object(KafkaClient, '_get_conn', side_effect=mock_get_conn):
client = KafkaClient(hosts=['kafka01:9092', 'kafka02:9092'])
client = KafkaClient(hosts=['kafka01:9092', 'kafka02:9092']) self.assertRaises(
KafkaUnavailableError,
client._send_broker_unaware_request,
1, 'fake request')
self.assertRaises( for key, conn in mocked_conns.iteritems():
KafkaUnavailableError, conn.send.assert_called_with(1, 'fake request')
client._send_broker_unaware_request,
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): def test_send_broker_unaware_request(self):
'Tests that call works when at least one of the host is available' '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)] return mocked_conns[(host, port)]
# patch to avoid making requests before we want it # patch to avoid making requests before we want it
with patch.object(KafkaClient, 'load_metadata_for_topics'), \ with patch.object(KafkaClient, 'load_metadata_for_topics'):
patch.object(KafkaClient, '_get_conn', side_effect=mock_get_conn): with patch.object(KafkaClient, '_get_conn', side_effect=mock_get_conn):
client = KafkaClient(hosts='kafka01:9092,kafka02:9092')
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.KafkaConnection')
@patch('kafka.client.KafkaProtocol') @patch('kafka.client.KafkaProtocol')

4
tox.ini
View File

@@ -1,7 +1,9 @@
[tox] [tox]
envlist = py26, py27 envlist = py26, py27
[testenv] [testenv]
deps = pytest deps =
pytest
mock
commands = py.test --basetemp={envtmpdir} [] commands = py.test --basetemp={envtmpdir} []
setenv = setenv =
PROJECT_ROOT = {toxinidir} PROJECT_ROOT = {toxinidir}