summaryrefslogtreecommitdiff
path: root/test/conftest.py
diff options
context:
space:
mode:
authorJeff Widman <jeff@jeffwidman.com>2018-10-27 00:11:10 -0700
committerJeff Widman <jeff@jeffwidman.com>2018-10-27 02:17:23 -0700
commitf00016e7cec64cfc9697b233809cd37e0e19cc64 (patch)
tree37d1d290b86c1e8e97776c1bd344261743cc04e4 /test/conftest.py
parent1945ad16a15f53a07fae489b20ac616bb184ca89 (diff)
downloadkafka-python-f00016e7cec64cfc9697b233809cd37e0e19cc64.tar.gz
Cleanup fixture imports
`random_string` now comes from `test.fixtures` and was being transparently imported via `test.testutil` so this bypasses the pointless indirect import. Similarly, `kafka_version` was transparently imported by `test.testutil` from `test.fixtures`. Also removed `random_port()` in `test.testutil` because its unused as its been replaced by the one in `test.fixtures`. This is part of the pytest migration that was started back in a1869c4be5f47b4f6433610249aaf29af4ec95e5.
Diffstat (limited to 'test/conftest.py')
-rw-r--r--test/conftest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/conftest.py b/test/conftest.py
index dbc2378..a751d95 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -4,8 +4,8 @@ import inspect
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():