Run sslutils and wsgi tests for python3

This change allows to execute all tests on python 3.
TestWSGIServerWithSSL were skipped on python 3 due to bug 1482633.

Change-Id: I5ae9e50c8160da2cd6f1c3bed6600867845bbe23
Related-Bug: #1482633
This commit is contained in:
Elena Ezhova 2015-12-22 13:24:14 +03:00
parent 43e825ba16
commit e36843c2be
2 changed files with 5 additions and 11 deletions

View File

@ -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!!!'

11
tox.ini
View File

@ -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}