Merge "Use the hostname from the Transport for GSSAPI Authentication"
This commit is contained in:
commit
aee3b94d23
@ -460,7 +460,7 @@ class Controller(pyngus.ConnectionEventHandler):
|
|||||||
def _do_connect(self):
|
def _do_connect(self):
|
||||||
"""Establish connection and reply subscription on processor thread."""
|
"""Establish connection and reply subscription on processor thread."""
|
||||||
host = self.hosts.current
|
host = self.hosts.current
|
||||||
conn_props = {}
|
conn_props = {'hostname': host.hostname}
|
||||||
if self.idle_timeout:
|
if self.idle_timeout:
|
||||||
conn_props["idle-time-out"] = float(self.idle_timeout)
|
conn_props["idle-time-out"] = float(self.idle_timeout)
|
||||||
if self.trace_protocol:
|
if self.trace_protocol:
|
||||||
|
1
tox.ini
1
tox.ini
@ -5,6 +5,7 @@ envlist = py34,py27,pep8
|
|||||||
setenv =
|
setenv =
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
OS_TEST_TIMEOUT=30
|
OS_TEST_TIMEOUT=30
|
||||||
|
PN_TRACE_FRM=1
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands = python setup.py testr --slowest --testr-args='{posargs}'
|
commands = python setup.py testr --slowest --testr-args='{posargs}'
|
||||||
|
Loading…
Reference in New Issue
Block a user