summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMark Roberts <wizzat@gmail.com>2015-01-15 00:49:46 -0800
committerMark Roberts <wizzat@gmail.com>2015-01-15 00:49:46 -0800
commite6b37c00c5b0a52f821b35a4e26c0943f3e05b07 (patch)
tree14b58764d5d711360d04606e10cec7dc6d6400af /test
parent28a838516b3feb81c3c7f7fbd6aad2391a4139c5 (diff)
parent21a5ca834b9e0831b29870b5d099263892f21a7d (diff)
downloadkafka-python-e6b37c00c5b0a52f821b35a4e26c0943f3e05b07.tar.gz
Merge pull request #295 from dpkp/kafka_0_8_2
Kafka 0.8.2.0 updates
Diffstat (limited to 'test')
-rw-r--r--test/fixtures.py6
-rw-r--r--test/test_client_integration.py2
-rw-r--r--test/test_consumer_integration.py4
3 files changed, 6 insertions, 6 deletions
diff --git a/test/fixtures.py b/test/fixtures.py
index b286619..3c496fd 100644
--- a/test/fixtures.py
+++ b/test/fixtures.py
@@ -123,7 +123,7 @@ class ZookeeperFixture(Fixture):
# Party!
self.out("Starting...")
self.child.start()
- self.child.wait_for(r"Snapshotting")
+ self.child.wait_for(r"binding to port")
self.out("Done!")
def close(self):
@@ -212,8 +212,8 @@ class KafkaFixture(Fixture):
if proc.wait() != 0:
self.out("Failed to create Zookeeper chroot node")
- self.out(proc.stdout)
- self.out(proc.stderr)
+ self.out(proc.stdout.read())
+ self.out(proc.stderr.read())
raise RuntimeError("Failed to create Zookeeper chroot node")
self.out("Done!")
diff --git a/test/test_client_integration.py b/test/test_client_integration.py
index cc60778..c0331ea 100644
--- a/test/test_client_integration.py
+++ b/test/test_client_integration.py
@@ -54,7 +54,7 @@ class TestKafkaClientIntegration(KafkaIntegrationTestCase):
# Offset Tests #
####################
- @kafka_versions("0.8.1", "0.8.1.1")
+ @kafka_versions("0.8.1", "0.8.1.1", "0.8.2.0")
def test_commit_fetch_offsets(self):
req = OffsetCommitRequest(self.topic, 0, 42, b"metadata")
(resp,) = self.client.send_offset_commit_request(b"group", [req])
diff --git a/test/test_consumer_integration.py b/test/test_consumer_integration.py
index ea32318..4723220 100644
--- a/test/test_consumer_integration.py
+++ b/test/test_consumer_integration.py
@@ -257,7 +257,7 @@ class TestConsumerIntegration(KafkaIntegrationTestCase):
big_consumer.stop()
- @kafka_versions("0.8.1", "0.8.1.1")
+ @kafka_versions("0.8.1", "0.8.1.1", "0.8.2.0")
def test_offset_behavior__resuming_behavior(self):
self.send_messages(0, range(0, 100))
self.send_messages(1, range(100, 200))
@@ -357,7 +357,7 @@ class TestConsumerIntegration(KafkaIntegrationTestCase):
self.assertEqual(len(messages), 5)
self.assertGreaterEqual(t.interval, TIMEOUT_MS / 1000.0 )
- @kafka_versions("0.8.1", "0.8.1.1")
+ @kafka_versions("0.8.1", "0.8.1.1", "0.8.2.0")
def test_kafka_consumer__offset_commit_resume(self):
GROUP_ID = random_string(10)