This fixes a typo that broke the client for HTTPS URLs. Added a basic test to cover this case. Coverage is very low in common/http.py. Change-Id: Ic440f20f463c3b8558a7639f1015096a01496cf8 Closes-bug: 1244091
56 lines
2.0 KiB
Python
56 lines
2.0 KiB
Python
# Copyright 2012 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.
|
|
|
|
from __future__ import print_function
|
|
|
|
from ceilometerclient.common import http
|
|
from ceilometerclient.tests import utils
|
|
|
|
|
|
class HttpClientTest(utils.BaseTestCase):
|
|
url = 'http://localhost'
|
|
|
|
def test_url_generation_trailing_slash_in_base(self):
|
|
client = http.HTTPClient("%s/" % self.url)
|
|
url = client._make_connection_url('/v1/resources')
|
|
print(client.connection_params)
|
|
self.assertEqual(url, '/v1/resources')
|
|
|
|
def test_url_generation_without_trailing_slash_in_base(self):
|
|
client = http.HTTPClient(self.url)
|
|
url = client._make_connection_url('/v1/resources')
|
|
print(client.connection_params)
|
|
self.assertEqual(url, '/v1/resources')
|
|
|
|
def test_url_generation_prefix_slash_in_path(self):
|
|
client = http.HTTPClient("%s/" % self.url)
|
|
url = client._make_connection_url('/v1/resources')
|
|
print(client.connection_params)
|
|
self.assertEqual(url, '/v1/resources')
|
|
|
|
def test_url_generation_without_prefix_slash_in_path(self):
|
|
client = http.HTTPClient(self.url)
|
|
url = client._make_connection_url('v1/resources')
|
|
print(client.connection_params)
|
|
self.assertEqual(url, '/v1/resources')
|
|
|
|
def test_get_connection(self):
|
|
client = http.HTTPClient(self.url)
|
|
self.assertIsNotNone(client.get_connection())
|
|
|
|
|
|
class HttpsClientTest(HttpClientTest):
|
|
url = 'https://localhost'
|