Cleanup fixture imports

test/conftest.py

@@ -4,8 +4,8 @@
 
 import pytest
 
-from test.fixtures import KafkaFixture, ZookeeperFixture
-from test.testutil import kafka_version, random_string
+from test.fixtures import KafkaFixture, ZookeeperFixture, random_string, version as kafka_version
+
 
 @pytest.fixture(scope="module")
 def version():

test/test_codec.py

@@ -14,7 +14,7 @@
     lz4_encode_old_kafka, lz4_decode_old_kafka,
 )
 
-from test.testutil import random_string
+from test.fixtures import random_string
 
 
 def test_gzip():

test/test_consumer_group.py

@@ -13,7 +13,7 @@
 from kafka.structs import TopicPartition
 
 from test.conftest import version
-from test.testutil import random_string
+from test.fixtures import random_string
 
 
 def get_connect_str(kafka_broker):

test/test_consumer_integration.py

@@ -24,9 +24,9 @@
 )
 
 from test.conftest import version
-from test.fixtures import ZookeeperFixture, KafkaFixture
+from test.fixtures import ZookeeperFixture, KafkaFixture, random_string
 from test.testutil import (
-    KafkaIntegrationTestCase, kafka_versions, random_string, Timer,
+    KafkaIntegrationTestCase, kafka_versions, Timer,
     send_messages
 )
 

test/test_failover_integration.py

@@ -9,8 +9,8 @@
 from kafka.producer.base import Producer
 from kafka.structs import TopicPartition
 
-from test.fixtures import ZookeeperFixture, KafkaFixture
-from test.testutil import KafkaIntegrationTestCase, random_string
+from test.fixtures import ZookeeperFixture, KafkaFixture, random_string
+from test.testutil import KafkaIntegrationTestCase
 
 
 log = logging.getLogger(__name__)

test/test_producer.py

@@ -8,7 +8,7 @@
 from kafka import KafkaConsumer, KafkaProducer, TopicPartition
 from kafka.producer.buffer import SimpleBufferPool
 from test.conftest import version
-from test.testutil import random_string
+from test.fixtures import random_string
 
 
 def test_buffer_pool():

test/testutil.py

@@ -19,6 +19,7 @@
 from kafka.structs import OffsetRequestPayload, ProduceRequestPayload
 from test.fixtures import random_string, version_str_to_list, version as kafka_version #pylint: disable=wrong-import-order
 
+
 def kafka_versions(*versions):
 
     def construct_lambda(s):
@@ -65,12 +66,6 @@ def wrapper(func, *args, **kwargs):
 
     return real_kafka_versions
 
-def get_open_port():
-    sock = socket.socket()
-    sock.bind(("", 0))
-    port = sock.getsockname()[1]
-    sock.close()
-    return port
 
 _MESSAGES = {}
 def msg(message):