From 57d5471f3688590c11b2e204909ded37f76cab44 Mon Sep 17 00:00:00 2001 From: Denis Otkidach Date: Sat, 21 Oct 2023 22:47:07 +0300 Subject: [PATCH] Adjust imports in kafka-python tests --- requirements-ci.txt | 1 + tests/kafka/conftest.py | 4 ++-- tests/kafka/fixtures.py | 4 ++-- tests/kafka/record/__init__.py | 0 tests/kafka/record/test_default_records.py | 2 +- tests/kafka/record/test_legacy_records.py | 2 +- tests/kafka/test_admin_integration.py | 2 +- tests/kafka/test_codec.py | 2 +- tests/kafka/test_conn.py | 2 +- tests/kafka/test_consumer_group.py | 2 +- tests/kafka/test_consumer_integration.py | 4 ++-- tests/kafka/test_producer.py | 2 +- tests/kafka/test_sasl_integration.py | 2 +- 13 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 tests/kafka/record/__init__.py diff --git a/requirements-ci.txt b/requirements-ci.txt index 315662ef..3d09463d 100644 --- a/requirements-ci.txt +++ b/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 diff --git a/tests/kafka/conftest.py b/tests/kafka/conftest.py index 3fa0262f..0bbd1a2b 100644 --- a/tests/kafka/conftest.py +++ b/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(): diff --git a/tests/kafka/fixtures.py b/tests/kafka/fixtures.py index d9c072b8..5299bf3e 100644 --- a/tests/kafka/fixtures.py +++ b/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__) diff --git a/tests/kafka/record/__init__.py b/tests/kafka/record/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/kafka/record/test_default_records.py b/tests/kafka/record/test_default_records.py index c3a7b02c..3c809ebc 100644 --- a/tests/kafka/record/test_default_records.py +++ b/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 diff --git a/tests/kafka/record/test_legacy_records.py b/tests/kafka/record/test_legacy_records.py index 43970f7c..0c87ad9a 100644 --- a/tests/kafka/record/test_legacy_records.py +++ b/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 ) diff --git a/tests/kafka/test_admin_integration.py b/tests/kafka/test_admin_integration.py index 06c40a22..87ba289d 100644 --- a/tests/kafka/test_admin_integration.py +++ b/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 diff --git a/tests/kafka/test_codec.py b/tests/kafka/test_codec.py index e0570745..db6a14b6 100644 --- a/tests/kafka/test_codec.py +++ b/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(): diff --git a/tests/kafka/test_conn.py b/tests/kafka/test_conn.py index 966f7b34..b49a8bd3 100644 --- a/tests/kafka/test_conn.py +++ b/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 diff --git a/tests/kafka/test_consumer_group.py b/tests/kafka/test_consumer_group.py index 58dc7ebf..40dc9d70 100644 --- a/tests/kafka/test_consumer_group.py +++ b/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): diff --git a/tests/kafka/test_consumer_integration.py b/tests/kafka/test_consumer_integration.py index 90b7ed20..a2644bae 100644 --- a/tests/kafka/test_consumer_integration.py +++ b/tests/kafka/test_consumer_integration.py @@ -1,7 +1,7 @@ import logging import time -from mock import patch +from unittest.mock import patch import pytest from kafka.vendor.six.moves import range @@ -9,7 +9,7 @@ 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") diff --git a/tests/kafka/test_producer.py b/tests/kafka/test_producer.py index 7263130d..97099e93 100644 --- a/tests/kafka/test_producer.py +++ b/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(): diff --git a/tests/kafka/test_sasl_integration.py b/tests/kafka/test_sasl_integration.py index e3a4813a..d66a7349 100644 --- a/tests/kafka/test_sasl_integration.py +++ b/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(