Merge "Correct testcase content"

This commit is contained in:
Jenkins
2014-04-23 00:06:30 +00:00
committed by Gerrit Code Review

View File

@@ -22,22 +22,22 @@ from ceilometerclient.tests import utils
class HttpClientTest(utils.BaseTestCase):
url = 'http://localhost'
def test_url_generation_trailing_slash_in_base(self):
def test_url_generation_trailing_slash_in_base_prefix_in_path(self):
client = http.HTTPClient("%s/" % self.url)
url = client._make_connection_url('/v1/resources')
self.assertEqual(url, '/v1/resources')
def test_url_generation_without_trailing_slash_in_base(self):
def test_url_generation_no_trailing_slash_in_base_prefix_in_path(self):
client = http.HTTPClient(self.url)
url = client._make_connection_url('/v1/resources')
self.assertEqual(url, '/v1/resources')
def test_url_generation_prefix_slash_in_path(self):
def test_url_generation_trailing_slash_in_base_no_prefix_in_path(self):
client = http.HTTPClient("%s/" % self.url)
url = client._make_connection_url('/v1/resources')
url = client._make_connection_url('v1/resources')
self.assertEqual(url, '/v1/resources')
def test_url_generation_without_prefix_slash_in_path(self):
def test_url_generation_no_trailing_slash_in_base_no_prefix_in_path(self):
client = http.HTTPClient(self.url)
url = client._make_connection_url('v1/resources')
self.assertEqual(url, '/v1/resources')