diff options
| author | Dana Powers <dana.powers@rd.io> | 2014-09-07 18:52:05 -0700 |
|---|---|---|
| committer | Dana Powers <dana.powers@rd.io> | 2014-09-07 19:09:32 -0700 |
| commit | 715425c639a476139065689afde3d255a07d6f96 (patch) | |
| tree | 0ef2cd875c97c8ca867d89328d6fd5fec7dfcbe8 /test/test_consumer_integration.py | |
| parent | a99384f4c601d127ab1c4fe5b272ea5c07fd695d (diff) | |
| parent | be23042ecd9ab330886745ccc9ec9e3a0039836f (diff) | |
| download | kafka-python-715425c639a476139065689afde3d255a07d6f96.tar.gz | |
Merge pull request #227 from wizzat-feature/py3
Python 3 Support
Conflicts:
kafka/producer.py
test/test_client.py
test/test_client_integration.py
test/test_codec.py
test/test_consumer.py
test/test_consumer_integration.py
test/test_failover_integration.py
test/test_producer.py
test/test_producer_integration.py
test/test_protocol.py
test/test_util.py
Diffstat (limited to 'test/test_consumer_integration.py')
| -rw-r--r-- | test/test_consumer_integration.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/test_consumer_integration.py b/test/test_consumer_integration.py index 6576a32..6895c0e 100644 --- a/test/test_consumer_integration.py +++ b/test/test_consumer_integration.py @@ -1,5 +1,7 @@ import os +from six.moves import xrange + from kafka import SimpleConsumer, MultiProcessConsumer, create_message from kafka.common import ProduceRequest, ConsumerFetchSizeTooSmall from kafka.consumer import MAX_FETCH_BUFFER_SIZE_BYTES @@ -150,7 +152,7 @@ class TestConsumerIntegration(KafkaIntegrationTestCase): with Timer() as t: messages = consumer.get_messages(count=10, block=True, timeout=5) self.assert_message_count(messages, 5) - self.assertGreaterEqual(t.interval, 5) + self.assertGreaterEqual(t.interval, 4.95) consumer.stop() @@ -269,7 +271,7 @@ class TestConsumerIntegration(KafkaIntegrationTestCase): kwargs.setdefault('auto_commit', True) consumer_class = kwargs.pop('consumer', SimpleConsumer) - group = kwargs.pop('group', self.id()) + group = kwargs.pop('group', self.id().encode('utf-8')) topic = kwargs.pop('topic', self.topic) if consumer_class == SimpleConsumer: |