diff --git a/oslo_service/tests/test_wsgi.py b/oslo_service/tests/test_wsgi.py index fb6d801f..58ca0a90 100644 --- a/oslo_service/tests/test_wsgi.py +++ b/oslo_service/tests/test_wsgi.py @@ -18,6 +18,7 @@ import os import platform +import six import socket import tempfile import testtools @@ -282,6 +283,7 @@ class TestWSGIServerWithSSL(WsgiTestCase): key_file=key_file_name, group=sslutils.config_section) + @testtools.skipIf(six.PY3, "bug/1482633: test hangs on Python 3") def test_ssl_server(self): def test_app(env, start_response): start_response('200 OK', {}) @@ -304,6 +306,7 @@ class TestWSGIServerWithSSL(WsgiTestCase): fake_ssl_server.stop() fake_ssl_server.wait() + @testtools.skipIf(six.PY3, "bug/1482633: test hangs on Python 3") def test_two_servers(self): def test_app(env, start_response): start_response('200 OK', {}) @@ -341,6 +344,7 @@ class TestWSGIServerWithSSL(WsgiTestCase): @testtools.skipIf(platform.mac_ver()[0] != '', 'SO_REUSEADDR behaves differently ' 'on OSX, see bug 1436895') + @testtools.skipIf(six.PY3, "bug/1482633: test hangs on Python 3") def test_socket_options_for_ssl_server(self): # test normal socket options has set properly self.config(tcp_keepidle=500) @@ -360,6 +364,7 @@ class TestWSGIServerWithSSL(WsgiTestCase): server.wait() @testtools.skipIf(not netutils.is_ipv6_enabled(), "no ipv6 support") + @testtools.skipIf(six.PY3, "bug/1482633: test hangs on Python 3") def test_app_using_ipv6_and_ssl(self): greetings = 'Hello, World!!!' diff --git a/tox.ini b/tox.ini index 311c1b1f..17454d2c 100644 --- a/tox.ini +++ b/tox.ini @@ -18,17 +18,6 @@ commands = python setup.py testr --slowest --testr-args='{posargs}' doc8 --ignore-path "doc/source/history.rst" doc/source -[testenv:py34] -commands = - find . -type f -name "*.pyc" -delete - python -m testtools.run \ - oslo_service.tests.test_eventlet_backdoor \ - oslo_service.tests.test_loopingcall \ - oslo_service.tests.test_periodic \ - oslo_service.tests.test_service \ - oslo_service.tests.test_systemd \ - oslo_service.tests.test_threadgroup - [testenv:venv] commands = {posargs}