diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-13 13:09:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-13 13:09:16 +0000 |
| commit | 7479689e72e1739d95c00fee829f7bc0711ce763 (patch) | |
| tree | 2c259ade462ba58b91af19720c0285fa6f21ed42 | |
| parent | d224034ce7e573fc35ac2c0bc22bd80fc106144e (diff) | |
| parent | ae1123e438ef0c3a1abe427afe3ed1c4c5e727be (diff) | |
| download | oslo-messaging-7479689e72e1739d95c00fee829f7bc0711ce763.tar.gz | |
Merge "[zmq] Add py34 configuration for functional tests"
| -rw-r--r-- | oslo_messaging/_drivers/zmq_driver/zmq_socket.py | 5 | ||||
| -rw-r--r-- | tox.ini | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/oslo_messaging/_drivers/zmq_driver/zmq_socket.py b/oslo_messaging/_drivers/zmq_driver/zmq_socket.py index 11c567a..1179e24 100644 --- a/oslo_messaging/_drivers/zmq_driver/zmq_socket.py +++ b/oslo_messaging/_drivers/zmq_driver/zmq_socket.py @@ -143,7 +143,10 @@ class ZmqSocket(object): raise rpc_common.RPCException(errmsg) def connect_to_host(self, host): - address = zmq_address.get_tcp_direct_address(host) + address = zmq_address.get_tcp_direct_address( + host.decode('utf-8') if six.PY3 and + isinstance(host, six.binary_type) else host + ) self.connect_to_address(address) @@ -62,6 +62,10 @@ commands = {toxinidir}/setup-test-env-qpid.sh 1.0 python setup.py testr --slowes [testenv:py27-func-zeromq] commands = {toxinidir}/setup-test-env-zmq.sh python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}' +[testenv:py34-func-zeromq] +basepython = python3.4 +commands = {toxinidir}/setup-test-env-zmq.sh python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}' + [testenv:py27-func-zeromq-proxy] commands = {toxinidir}/setup-test-env-zmq-proxy.sh python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional' |