Merge pull request dpkp#1 from wizzat/pr109

Fix py26 compatibility issue, add mock to tox
52388fa · Mar 20, 2014 · 51246fb · 51246fb
2 parents 19646b1 + 017f484
commit 51246fb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git 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
@@ -1,7 +1,9 @@
 [tox]
 envlist = py26, py27
 [testenv]
-deps = pytest
+deps =
+    pytest
+    mock
 commands = py.test --basetemp={envtmpdir} []
 setenv =
     PROJECT_ROOT = {toxinidir}