summaryrefslogtreecommitdiff
path: root/test/test_client.py
diff options
context:
space:
mode:
authorBruno ReniƩ <brutasse@gmail.com>2014-08-28 20:50:20 +0200
committerMark Roberts <wizzat@fb.com>2014-09-03 09:55:44 -0700
commitcf0b7f0530e765f2cf710bd35daf53bb4ea205d2 (patch)
treef38669f145112a7f301691f311b3c8aca51d1f59 /test/test_client.py
parent83af5102e995e854a1980b90f1400afdd098da37 (diff)
downloadkafka-python-cf0b7f0530e765f2cf710bd35daf53bb4ea205d2.tar.gz
Make all unit tests pass on py3.3/3.4
Diffstat (limited to 'test/test_client.py')
-rw-r--r--test/test_client.py21
1 files changed, 11 insertions, 10 deletions
diff --git a/test/test_client.py b/test/test_client.py
index b7591e9..601e454 100644
--- a/test/test_client.py
+++ b/test/test_client.py
@@ -1,5 +1,6 @@
from . import unittest
+import six
from mock import MagicMock, patch
from kafka import KafkaClient
@@ -15,25 +16,25 @@ class TestKafkaClient(unittest.TestCase):
with patch.object(KafkaClient, 'load_metadata_for_topics'):
client = KafkaClient(hosts=['kafka01:9092', 'kafka02:9092', 'kafka03:9092'])
- self.assertItemsEqual(
- [('kafka01', 9092), ('kafka02', 9092), ('kafka03', 9092)],
- client.hosts)
+ self.assertEqual(
+ sorted([('kafka01', 9092), ('kafka02', 9092), ('kafka03', 9092)]),
+ sorted(client.hosts))
def test_init_with_csv(self):
with patch.object(KafkaClient, 'load_metadata_for_topics'):
client = KafkaClient(hosts='kafka01:9092,kafka02:9092,kafka03:9092')
- self.assertItemsEqual(
- [('kafka01', 9092), ('kafka02', 9092), ('kafka03', 9092)],
- client.hosts)
+ self.assertEqual(
+ sorted([('kafka01', 9092), ('kafka02', 9092), ('kafka03', 9092)]),
+ sorted(client.hosts))
def test_init_with_unicode_csv(self):
with patch.object(KafkaClient, 'load_metadata_for_topics'):
client = KafkaClient(hosts=u'kafka01:9092,kafka02:9092,kafka03:9092')
- self.assertItemsEqual(
- [('kafka01', 9092), ('kafka02', 9092), ('kafka03', 9092)],
- client.hosts)
+ self.assertEqual(
+ sorted([('kafka01', 9092), ('kafka02', 9092), ('kafka03', 9092)]),
+ sorted(client.hosts))
def test_send_broker_unaware_request_fail(self):
'Tests that call fails when all hosts are unavailable'
@@ -58,7 +59,7 @@ class TestKafkaClient(unittest.TestCase):
with self.assertRaises(KafkaUnavailableError):
client._send_broker_unaware_request(1, 'fake request')
- for key, conn in mocked_conns.iteritems():
+ for key, conn in six.iteritems(mocked_conns):
conn.send.assert_called_with(1, 'fake request')
def test_send_broker_unaware_request(self):