From e240bddd5accce0335256e3ccac424c52b829882 Mon Sep 17 00:00:00 2001 From: Mike Fedosin Date: Tue, 7 Jul 2015 14:46:29 +0300 Subject: [PATCH] Fix an issue with broken test on ci Several tests with cert verification are broken. This code fixes it by setting right imports. Also some typos are fixed too. Change-Id: Ie014f90714c3dabee65459fd704dd11b1770c7de Closed-Bug: #1472234 --- glanceclient/tests/unit/test_ssl.py | 56 ++++++++++++++--------------- glanceclient/v2/__init__.py | 15 ++++++++ 2 files changed, 43 insertions(+), 28 deletions(-) diff --git a/glanceclient/tests/unit/test_ssl.py b/glanceclient/tests/unit/test_ssl.py index 4056850c..b6ae083f 100644 --- a/glanceclient/tests/unit/test_ssl.py +++ b/glanceclient/tests/unit/test_ssl.py @@ -91,16 +91,16 @@ class TestHTTPSVerifyCert(testtools.TestCase): url = 'https://0.0.0.0:%d' % port try: - client = v1.client.Client(url, - insecure=False, - ssl_compression=True) + client = v1.Client(url, + insecure=False, + ssl_compression=True) client.images.get('image123') - self.fail('No SSL exception raised') + self.fail('No SSL exception has been raised') except exc.CommunicationError as e: if 'certificate verify failed' not in e.message: - self.fail('No certificate failure message received') - except Exception as e: - self.fail('Unexpected exception raised') + self.fail('No certificate failure message is received') + except Exception: + self.fail('Unexpected exception has been raised') def test_v1_requests_cert_verification_no_compression(self): """v1 regression test for bug 115260.""" @@ -108,16 +108,16 @@ class TestHTTPSVerifyCert(testtools.TestCase): url = 'https://0.0.0.0:%d' % port try: - client = v1.client.Client(url, - insecure=False, - ssl_compression=False) + client = v1.Client(url, + insecure=False, + ssl_compression=False) client.images.get('image123') - self.fail('No SSL exception raised') + self.fail('No SSL exception has been raised') except SSL.Error as e: if 'certificate verify failed' not in str(e): - self.fail('No certificate failure message received') - except Exception as e: - self.fail('Unexpected exception raised') + self.fail('No certificate failure message is received') + except Exception: + self.fail('Unexpected exception has been raised') def test_v2_requests_cert_verification(self): """v2 regression test for bug 115260.""" @@ -125,16 +125,16 @@ class TestHTTPSVerifyCert(testtools.TestCase): url = 'https://0.0.0.0:%d' % port try: - gc = v2.client.Client(url, - insecure=False, - ssl_compression=True) + gc = v2.Client(url, + insecure=False, + ssl_compression=True) gc.images.get('image123') - self.fail('No SSL exception raised') + self.fail('No SSL exception has been raised') except exc.CommunicationError as e: if 'certificate verify failed' not in e.message: - self.fail('No certificate failure message received') - except Exception as e: - self.fail('Unexpected exception raised') + self.fail('No certificate failure message is received') + except Exception: + self.fail('Unexpected exception has been raised') def test_v2_requests_cert_verification_no_compression(self): """v2 regression test for bug 115260.""" @@ -142,16 +142,16 @@ class TestHTTPSVerifyCert(testtools.TestCase): url = 'https://0.0.0.0:%d' % port try: - gc = v2.client.Client(url, - insecure=False, - ssl_compression=False) + gc = v2.Client(url, + insecure=False, + ssl_compression=False) gc.images.get('image123') - self.fail('No SSL exception raised') + self.fail('No SSL exception has been raised') except SSL.Error as e: if 'certificate verify failed' not in str(e): - self.fail('No certificate failure message received') - except Exception as e: - self.fail('Unexpected exception raised') + self.fail('No certificate failure message is received') + except Exception: + self.fail('Unexpected exception has been raised') class TestVerifiedHTTPSConnection(testtools.TestCase): diff --git a/glanceclient/v2/__init__.py b/glanceclient/v2/__init__.py index e69de29b..d01db73a 100644 --- a/glanceclient/v2/__init__.py +++ b/glanceclient/v2/__init__.py @@ -0,0 +1,15 @@ +# Copyright (c) 2015 Mirantis, Inc. +# +# 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. + +from glanceclient.v2.client import Client # noqa