9a55baa2c8
This patch enables the py35 job in tox.ini to run using ostestr. It also fixes a bytes encoding issue in the 'test_wsgi' functional test to make progress towards the community goal of enabling python3.5. Two other functional tests remain disabled and will need to be addressed in a later patch in order to fully complete the community goal - 'test_ssl' and 'test_reload'. These tests fail due to SSL handshake not working in python3.5 when using self-signed certificate and authority. Change-Id: Ie9071f1a93d8201f754ae3042d6e51b5de6d2e63
87 lines
2.9 KiB
Python
87 lines
2.9 KiB
Python
# Copyright 2015 OpenStack Foundation
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import os
|
|
import unittest
|
|
|
|
import httplib2
|
|
import six
|
|
from six.moves import http_client as http
|
|
|
|
from glance.tests import functional
|
|
|
|
TEST_VAR_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__),
|
|
'..', 'var'))
|
|
|
|
|
|
class TestSSL(functional.FunctionalTest):
|
|
|
|
"""Functional tests verifying SSL communication"""
|
|
|
|
def setUp(self):
|
|
super(TestSSL, self).setUp()
|
|
|
|
if getattr(self, 'inited', False):
|
|
return
|
|
|
|
self.inited = False
|
|
self.disabled = True
|
|
|
|
# NOTE (stevelle): Test key/cert/CA file created as per:
|
|
# http://nrocco.github.io/2013/01/25/
|
|
# self-signed-ssl-certificate-chains.html
|
|
# For these tests certificate.crt must be created with 'Common Name'
|
|
# set to 127.0.0.1
|
|
|
|
self.key_file = os.path.join(TEST_VAR_DIR, 'privatekey.key')
|
|
if not os.path.exists(self.key_file):
|
|
self.disabled_message = ("Could not find private key file %s" %
|
|
self.key_file)
|
|
self.inited = True
|
|
return
|
|
|
|
self.cert_file = os.path.join(TEST_VAR_DIR, 'certificate.crt')
|
|
if not os.path.exists(self.cert_file):
|
|
self.disabled_message = ("Could not find certificate file %s" %
|
|
self.cert_file)
|
|
self.inited = True
|
|
return
|
|
|
|
self.ca_file = os.path.join(TEST_VAR_DIR, 'ca.crt')
|
|
if not os.path.exists(self.ca_file):
|
|
self.disabled_message = ("Could not find CA file %s" %
|
|
self.ca_file)
|
|
self.inited = True
|
|
return
|
|
|
|
self.inited = True
|
|
self.disabled = False
|
|
|
|
def tearDown(self):
|
|
super(TestSSL, self).tearDown()
|
|
if getattr(self, 'inited', False):
|
|
return
|
|
|
|
@unittest.skipIf(six.PY3, 'SSL handshakes are broken in PY3')
|
|
def test_ssl_ok(self):
|
|
"""Make sure the public API works with HTTPS."""
|
|
self.cleanup()
|
|
self.start_servers(**self.__dict__.copy())
|
|
|
|
path = "https://%s:%d/versions" % ("127.0.0.1", self.api_port)
|
|
https = httplib2.Http(ca_certs=self.ca_file)
|
|
response, content = https.request(path, 'GET')
|
|
self.assertEqual(http.OK, response.status)
|