diff options
| -rw-r--r-- | test/conftest.py | 33 | ||||
| -rw-r--r-- | test/fixtures.py | 3 | ||||
| -rw-r--r-- | test/test_consumer_group.py | 30 |
3 files changed, 36 insertions, 30 deletions
diff --git a/test/conftest.py b/test/conftest.py new file mode 100644 index 0000000..f3a8947 --- /dev/null +++ b/test/conftest.py @@ -0,0 +1,33 @@ +import os + +import pytest + +from test.fixtures import KafkaFixture, ZookeeperFixture + + +@pytest.fixture(scope="module") +def version(): + if 'KAFKA_VERSION' not in os.environ: + return () + return tuple(map(int, os.environ['KAFKA_VERSION'].split('.'))) + + +@pytest.fixture(scope="module") +def zookeeper(version, request): + assert version + zk = ZookeeperFixture.instance() + def fin(): + zk.close() + request.addfinalizer(fin) + return zk + + +@pytest.fixture(scope="module") +def kafka_broker(version, zookeeper, request): + assert version + k = KafkaFixture.instance(0, zookeeper.host, zookeeper.port, + partitions=4) + def fin(): + k.close() + request.addfinalizer(fin) + return k diff --git a/test/fixtures.py b/test/fixtures.py index 91a67c1..2613a41 100644 --- a/test/fixtures.py +++ b/test/fixtures.py @@ -5,10 +5,11 @@ import shutil import subprocess import tempfile import time -from six.moves import urllib import uuid +from six.moves import urllib from six.moves.urllib.parse import urlparse # pylint: disable=E0611,F0401 + from test.service import ExternalService, SpawnedService from test.testutil import get_open_port diff --git a/test/test_consumer_group.py b/test/test_consumer_group.py index 035d65a..f153d2d 100644 --- a/test/test_consumer_group.py +++ b/test/test_consumer_group.py @@ -12,38 +12,10 @@ from kafka.common import TopicPartition from kafka.conn import BrokerConnection, ConnectionStates from kafka.consumer.group import KafkaConsumer -from test.fixtures import KafkaFixture, ZookeeperFixture +from test.conftest import version from test.testutil import random_string -@pytest.fixture(scope="module") -def version(): - if 'KAFKA_VERSION' not in os.environ: - return () - return tuple(map(int, os.environ['KAFKA_VERSION'].split('.'))) - - -@pytest.fixture(scope="module") -def zookeeper(version, request): - assert version - zk = ZookeeperFixture.instance() - def fin(): - zk.close() - request.addfinalizer(fin) - return zk - - -@pytest.fixture(scope="module") -def kafka_broker(version, zookeeper, request): - assert version - k = KafkaFixture.instance(0, zookeeper.host, zookeeper.port, - partitions=4) - def fin(): - k.close() - request.addfinalizer(fin) - return k - - @pytest.fixture def simple_client(kafka_broker): connect_str = 'localhost:' + str(kafka_broker.port) |