Consolidate conn fixture definitions

This commit is contained in:
Dana Powers
2016-04-04 18:57:32 -07:00
parent 931373478e
commit d61e861b0d
4 changed files with 19 additions and 42 deletions

View File

@@ -31,3 +31,22 @@ def kafka_broker(version, zookeeper, request):
k.close() k.close()
request.addfinalizer(fin) request.addfinalizer(fin)
return k return k
@pytest.fixture
def conn(mocker):
from kafka.conn import ConnectionStates
from kafka.future import Future
from kafka.protocol.metadata import MetadataResponse
conn = mocker.patch('kafka.client_async.BrokerConnection')
conn.return_value = conn
conn.state = ConnectionStates.CONNECTED
conn.send.return_value = Future().success(
MetadataResponse[0](
[(0, 'foo', 12), (1, 'bar', 34)], # brokers
[])) # topics
conn.blacked_out.return_value = False
conn.connect.side_effect = lambda: conn.state
conn.connecting = lambda: conn.connect() is ConnectionStates.CONNECTING
conn.connected = lambda: conn.connect() is ConnectionStates.CONNECTED
return conn

View File

@@ -31,21 +31,6 @@ def test_bootstrap_servers(mocker, bootstrap, expected_hosts):
assert sorted(hosts) == sorted(expected_hosts) assert sorted(hosts) == sorted(expected_hosts)
@pytest.fixture
def conn(mocker):
conn = mocker.patch('kafka.client_async.BrokerConnection')
conn.return_value = conn
conn.state = ConnectionStates.CONNECTED
conn.send.return_value = Future().success(
MetadataResponse[0](
[(0, 'foo', 12), (1, 'bar', 34)], # brokers
[])) # topics
conn.blacked_out.return_value = False
conn.connect.side_effect = lambda: conn.state
conn.connected = lambda: conn.connect() is ConnectionStates.CONNECTED
return conn
def test_bootstrap_success(conn): def test_bootstrap_success(conn):
conn.state = ConnectionStates.CONNECTED conn.state = ConnectionStates.CONNECTED
cli = KafkaClient() cli = KafkaClient()

View File

@@ -9,8 +9,6 @@ import six
from kafka import SimpleClient from kafka import SimpleClient
from kafka.conn import ConnectionStates from kafka.conn import ConnectionStates
from kafka.consumer.group import KafkaConsumer from kafka.consumer.group import KafkaConsumer
from kafka.future import Future
from kafka.protocol.metadata import MetadataResponse
from kafka.structs import TopicPartition from kafka.structs import TopicPartition
from test.conftest import version from test.conftest import version
@@ -140,18 +138,6 @@ def test_paused(kafka_broker, topic):
assert set() == consumer.paused() assert set() == consumer.paused()
@pytest.fixture
def conn(mocker):
conn = mocker.patch('kafka.client_async.BrokerConnection')
conn.return_value = conn
conn.state = ConnectionStates.CONNECTED
conn.send.return_value = Future().success(
MetadataResponse[0](
[(0, 'foo', 12), (1, 'bar', 34)], # brokers
[])) # topics
return conn
def test_heartbeat_timeout(conn, mocker): def test_heartbeat_timeout(conn, mocker):
mocker.patch('kafka.client_async.KafkaClient.check_version', return_value = '0.9') mocker.patch('kafka.client_async.KafkaClient.check_version', return_value = '0.9')
mocker.patch('time.time', return_value = 1234) mocker.patch('time.time', return_value = 1234)

View File

@@ -12,7 +12,6 @@ from kafka.coordinator.assignors.roundrobin import RoundRobinPartitionAssignor
from kafka.coordinator.consumer import ConsumerCoordinator from kafka.coordinator.consumer import ConsumerCoordinator
from kafka.coordinator.protocol import ( from kafka.coordinator.protocol import (
ConsumerProtocolMemberMetadata, ConsumerProtocolMemberAssignment) ConsumerProtocolMemberMetadata, ConsumerProtocolMemberAssignment)
from kafka.conn import ConnectionStates
import kafka.errors as Errors import kafka.errors as Errors
from kafka.future import Future from kafka.future import Future
from kafka.protocol.commit import ( from kafka.protocol.commit import (
@@ -22,18 +21,6 @@ from kafka.protocol.metadata import MetadataResponse
from kafka.util import WeakMethod from kafka.util import WeakMethod
@pytest.fixture
def conn(mocker):
conn = mocker.patch('kafka.client_async.BrokerConnection')
conn.return_value = conn
conn.state = ConnectionStates.CONNECTED
conn.send.return_value = Future().success(
MetadataResponse[0](
[(0, 'foo', 12), (1, 'bar', 34)], # brokers
[])) # topics
return conn
@pytest.fixture @pytest.fixture
def coordinator(conn): def coordinator(conn):
return ConsumerCoordinator(KafkaClient(), SubscriptionState()) return ConsumerCoordinator(KafkaClient(), SubscriptionState())