summaryrefslogtreecommitdiff
path: root/test/conftest.py
diff options
context:
space:
mode:
authorDana Powers <dana.powers@gmail.com>2016-04-09 10:29:08 -0700
committerDana Powers <dana.powers@gmail.com>2016-04-09 10:29:08 -0700
commit0c94b83a2dff8113b5fd7c16df8a11ca03c4377b (patch)
tree54c8520e94af2d72ca715c4db9bb855fbfa5574d /test/conftest.py
parentcda2d59da4ff952adae1a75d906eaa3a99ac7f67 (diff)
parent097198cceaed97d5b804166d0c76a816c8dfead0 (diff)
downloadkafka-python-0c94b83a2dff8113b5fd7c16df8a11ca03c4377b.tar.gz
Merge pull request #621 from dpkp/ssl_support
Support SSL connections
Diffstat (limited to 'test/conftest.py')
-rw-r--r--test/conftest.py3
1 files changed, 2 insertions, 1 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