diff options
| author | Dana Powers <dana.powers@gmail.com> | 2016-04-09 10:29:08 -0700 |
|---|---|---|
| committer | Dana Powers <dana.powers@gmail.com> | 2016-04-09 10:29:08 -0700 |
| commit | 0c94b83a2dff8113b5fd7c16df8a11ca03c4377b (patch) | |
| tree | 54c8520e94af2d72ca715c4db9bb855fbfa5574d /test | |
| parent | cda2d59da4ff952adae1a75d906eaa3a99ac7f67 (diff) | |
| parent | 097198cceaed97d5b804166d0c76a816c8dfead0 (diff) | |
| download | kafka-python-0c94b83a2dff8113b5fd7c16df8a11ca03c4377b.tar.gz | |
Merge pull request #621 from dpkp/ssl_support
Support SSL connections
Diffstat (limited to 'test')
| -rw-r--r-- | test/conftest.py | 3 | ||||
| -rw-r--r-- | test/fixtures.py | 14 |
2 files changed, 12 insertions, 5 deletions
diff --git a/test/conftest.py b/test/conftest.py index 1f37960..c2ef1dd 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -51,7 +51,8 @@ def conn(mocker): return state conn._set_conn_state = _set_conn_state conn.connect.side_effect = lambda: conn.state - conn.connecting = lambda: conn.state is ConnectionStates.CONNECTING + conn.connecting = lambda: conn.state in (ConnectionStates.CONNECTING, + ConnectionStates.HANDSHAKE) conn.connected = lambda: conn.state is ConnectionStates.CONNECTED conn.disconnected = lambda: conn.state is ConnectionStates.DISCONNECTED return conn diff --git a/test/fixtures.py b/test/fixtures.py index e25ac22..826d037 100644 --- a/test/fixtures.py +++ b/test/fixtures.py @@ -182,8 +182,8 @@ class ZookeeperFixture(Fixture): class KafkaFixture(Fixture): @classmethod - def instance(cls, broker_id, zk_host, zk_port, - zk_chroot=None, port=None, replicas=1, partitions=2): + def instance(cls, broker_id, zk_host, zk_port, zk_chroot=None, port=None, + transport='PLAINTEXT', replicas=1, partitions=2): if zk_chroot is None: zk_chroot = "kafka-python_" + str(uuid.uuid4()).replace("-", "_") if "KAFKA_URI" in os.environ: @@ -194,16 +194,21 @@ class KafkaFixture(Fixture): if port is None: port = get_open_port() host = "127.0.0.1" - fixture = KafkaFixture(host, port, broker_id, zk_host, zk_port, zk_chroot, + fixture = KafkaFixture(host, port, broker_id, + zk_host, zk_port, zk_chroot, + transport=transport, replicas=replicas, partitions=partitions) fixture.open() return fixture - def __init__(self, host, port, broker_id, zk_host, zk_port, zk_chroot, replicas=1, partitions=2): + def __init__(self, host, port, broker_id, zk_host, zk_port, zk_chroot, + replicas=1, partitions=2, transport='PLAINTEXT'): self.host = host self.port = port self.broker_id = broker_id + self.transport = transport.upper() + self.ssl_dir = self.test_resource('ssl') self.zk_host = zk_host self.zk_port = zk_port @@ -233,6 +238,7 @@ class KafkaFixture(Fixture): self.out("Running local instance...") log.info(" host = %s", self.host) log.info(" port = %s", self.port) + log.info(" transport = %s", self.transport) log.info(" broker_id = %s", self.broker_id) log.info(" zk_host = %s", self.zk_host) log.info(" zk_port = %s", self.zk_port) |