Adjust imports in kafka-python tests

requirements-ci.txt

@@ -6,6 +6,7 @@ isort[colors]==5.10.0
 pytest==7.1.2
 pytest-cov==3.0.0
 pytest-asyncio==0.18.3
+pytest-mock==3.12.0
 docker==6.1.2
 chardet==4.0.0  # Until fixed requests is released
 lz4==3.1.3

tests/kafka/conftest.py

@@ -4,8 +4,8 @@
 
 import pytest
 
-from test.testutil import env_kafka_version, random_string
-from test.fixtures import KafkaFixture, ZookeeperFixture
+from tests.kafka.testutil import env_kafka_version, random_string
+from tests.kafka.fixtures import KafkaFixture, ZookeeperFixture
 
 @pytest.fixture(scope="module")
 def zookeeper():

tests/kafka/fixtures.py

@@ -17,8 +17,8 @@
 from kafka.errors import InvalidReplicationFactorError
 from kafka.protocol.admin import CreateTopicsRequest
 from kafka.protocol.metadata import MetadataRequest
-from test.testutil import env_kafka_version, random_string
-from test.service import ExternalService, SpawnedService
+from tests.kafka.testutil import env_kafka_version, random_string
+from tests.kafka.service import ExternalService, SpawnedService
 
 log = logging.getLogger(__name__)
 

tests/kafka/record/test_default_records.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 import pytest
-from mock import patch
+from unittest.mock import patch
 import kafka.codec
 from kafka.record.default_records import (
     DefaultRecordBatch, DefaultRecordBatchBuilder

tests/kafka/record/test_legacy_records.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 import pytest
-from mock import patch
+from unittest.mock import patch
 from kafka.record.legacy_records import (
     LegacyRecordBatch, LegacyRecordBatchBuilder
 )

tests/kafka/test_admin_integration.py

@@ -1,7 +1,7 @@
 import pytest
 
 from logging import info
-from test.testutil import env_kafka_version, random_string
+from tests.kafka.testutil import env_kafka_version, random_string
 from threading import Event, Thread
 from time import time, sleep
 

tests/kafka/test_codec.py

@@ -15,7 +15,7 @@
     zstd_encode, zstd_decode,
 )
 
-from test.testutil import random_string
+from tests.kafka.testutil import random_string
 
 
 def test_gzip():

tests/kafka/test_conn.py

@@ -4,7 +4,7 @@
 from errno import EALREADY, EINPROGRESS, EISCONN, ECONNRESET
 import socket
 
-import mock
+from unittest import mock
 import pytest
 
 from kafka.conn import BrokerConnection, ConnectionStates, collect_hosts

tests/kafka/test_consumer_group.py

@@ -11,7 +11,7 @@
 from kafka.coordinator.base import MemberState
 from kafka.structs import TopicPartition
 
-from test.testutil import env_kafka_version, random_string
+from tests.kafka.testutil import env_kafka_version, random_string
 
 
 def get_connect_str(kafka_broker):

tests/kafka/test_consumer_integration.py

@@ -1,15 +1,15 @@
 import logging
 import time
 
-from mock import patch
+from unittest.mock import patch
 import pytest
 from kafka.vendor.six.moves import range
 
 import kafka.codec
 from kafka.errors import UnsupportedCodecError, UnsupportedVersionError
 from kafka.structs import TopicPartition, OffsetAndTimestamp
 
-from test.testutil import Timer, assert_message_count, env_kafka_version, random_string
+from tests.kafka.testutil import Timer, assert_message_count, env_kafka_version, random_string
 
 
 @pytest.mark.skipif(not env_kafka_version(), reason="No KAFKA_VERSION set")

tests/kafka/test_producer.py

@@ -7,7 +7,7 @@
 
 from kafka import KafkaConsumer, KafkaProducer, TopicPartition
 from kafka.producer.buffer import SimpleBufferPool
-from test.testutil import env_kafka_version, random_string
+from tests.kafka.testutil import env_kafka_version, random_string
 
 
 def test_buffer_pool():

tests/kafka/test_sasl_integration.py

@@ -5,7 +5,7 @@
 
 from kafka.admin import NewTopic
 from kafka.protocol.metadata import MetadataRequest_v1
-from test.testutil import assert_message_count, env_kafka_version, random_string, special_to_underscore
+from tests.kafka.testutil import assert_message_count, env_kafka_version, random_string, special_to_underscore
 
 
 @pytest.fixture(