diff options
author | Dana Powers <dana.powers@rd.io> | 2016-01-23 22:46:17 -0800 |
---|---|---|
committer | Dana Powers <dana.powers@rd.io> | 2016-01-24 17:33:09 -0800 |
commit | acd1ae4d74c64ee6320c1709116a3e2bfcfaac7c (patch) | |
tree | 961a7f1591454899dc43e42ac8189a7d9d14e64a /test/test_consumer_group.py | |
parent | 34a18aea78edcccd8e4b6aba8a1394e1e4d098df (diff) | |
download | kafka-python-acd1ae4d74c64ee6320c1709116a3e2bfcfaac7c.tar.gz |
Move pytest broker/zk fixtures to test.conftest
Diffstat (limited to 'test/test_consumer_group.py')
-rw-r--r-- | test/test_consumer_group.py | 30 |
1 files changed, 1 insertions, 29 deletions
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) |