From acd1ae4d74c64ee6320c1709116a3e2bfcfaac7c Mon Sep 17 00:00:00 2001 From: Dana Powers Date: Sat, 23 Jan 2016 22:46:17 -0800 Subject: Move pytest broker/zk fixtures to test.conftest --- test/test_consumer_group.py | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) (limited to 'test/test_consumer_group.py') 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) -- cgit v1.2.1