From 83af5102e995e854a1980b90f1400afdd098da37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Reni=C3=A9?= Date: Thu, 28 Aug 2014 14:40:01 +0200 Subject: Use base unittest or unittest2 depending on python version --- test/test_failover_integration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/test_failover_integration.py') diff --git a/test/test_failover_integration.py b/test/test_failover_integration.py index 6c0e662..40269ee 100644 --- a/test/test_failover_integration.py +++ b/test/test_failover_integration.py @@ -1,7 +1,7 @@ import logging import os import time -import unittest2 +from . import unittest from kafka import * # noqa from kafka.common import * # noqa @@ -82,7 +82,7 @@ class TestFailover(KafkaIntegrationTestCase): #@kafka_versions("all") - @unittest2.skip("async producer does not support reliable failover yet") + @unittest.skip("async producer does not support reliable failover yet") def test_switch_leader_async(self): key, topic, partition = random_string(5), self.topic, 0 -- cgit v1.2.1 From cf0b7f0530e765f2cf710bd35daf53bb4ea205d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Reni=C3=A9?= Date: Thu, 28 Aug 2014 20:50:20 +0200 Subject: Make all unit tests pass on py3.3/3.4 --- test/test_failover_integration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/test_failover_integration.py') diff --git a/test/test_failover_integration.py b/test/test_failover_integration.py index 40269ee..d3121d6 100644 --- a/test/test_failover_integration.py +++ b/test/test_failover_integration.py @@ -6,8 +6,8 @@ from . import unittest from kafka import * # noqa from kafka.common import * # noqa from kafka.producer import Producer -from fixtures import ZookeeperFixture, KafkaFixture -from testutil import * +from .fixtures import ZookeeperFixture, KafkaFixture +from .testutil import * class TestFailover(KafkaIntegrationTestCase): -- cgit v1.2.1 From 81f51b9b284d750f5e5added2f2c4bd773acd604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Reni=C3=A9?= Date: Fri, 29 Aug 2014 15:23:48 +0200 Subject: Fix more tests, only multiprocessing consumer ones remaining --- test/test_failover_integration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/test_failover_integration.py') diff --git a/test/test_failover_integration.py b/test/test_failover_integration.py index d3121d6..ee84aad 100644 --- a/test/test_failover_integration.py +++ b/test/test_failover_integration.py @@ -60,7 +60,7 @@ class TestFailover(KafkaIntegrationTestCase): while not recovered and (time.time() - started) < timeout: try: logging.debug("attempting to send 'success' message after leader killed") - producer.send_messages(topic, partition, 'success') + producer.send_messages(topic, partition, b'success') logging.debug("success!") recovered = True except (FailedPayloadsError, ConnectionError): -- cgit v1.2.1