diff options
| author | Bruno Renié <brutasse@gmail.com> | 2014-08-28 14:40:01 +0200 |
|---|---|---|
| committer | Mark Roberts <wizzat@fb.com> | 2014-09-03 09:55:44 -0700 |
| commit | 83af5102e995e854a1980b90f1400afdd098da37 (patch) | |
| tree | 403e6dabbe62ac4f5bb6b2a76a5eed0f183d86b3 /test/test_client_integration.py | |
| parent | eddd1436c226545237aa057c35719950702466ed (diff) | |
| download | kafka-python-83af5102e995e854a1980b90f1400afdd098da37.tar.gz | |
Use base unittest or unittest2 depending on python version
Diffstat (limited to 'test/test_client_integration.py')
| -rw-r--r-- | test/test_client_integration.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test_client_integration.py b/test/test_client_integration.py index b5bcb22..3eb917f 100644 --- a/test/test_client_integration.py +++ b/test/test_client_integration.py @@ -1,6 +1,6 @@ import os import socket -import unittest2 +from . import unittest import kafka from kafka.common import * @@ -24,7 +24,7 @@ class TestKafkaClientIntegration(KafkaIntegrationTestCase): cls.server.close() cls.zk.close() - @unittest2.skip("This doesn't appear to work on Linux?") + @unittest.skip("This doesn't appear to work on Linux?") def test_timeout(self): server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) server_port = get_open_port() |