summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-04-23 00:06:30 +0000
committerGerrit Code Review <review@openstack.org>2014-04-23 00:06:30 +0000
commit2c21e7bbb0c9d3667c3bf7b43add8a734ea47d0b (patch)
tree7c90a0dce1d287f70ff5a08373cdfd3200477c8b
parentb3da9638264d3bc57a1341e86cc860c496195cfc (diff)
parentd7bc41a85dd141121220ddfd711b5f98f6f63b11 (diff)
downloadpython-ceilometerclient-2c21e7bbb0c9d3667c3bf7b43add8a734ea47d0b.tar.gz
Merge "Correct testcase content"
-rw-r--r--ceilometerclient/tests/test_http.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/ceilometerclient/tests/test_http.py b/ceilometerclient/tests/test_http.py
index 239bb86..c7a6404 100644
--- a/ceilometerclient/tests/test_http.py
+++ b/ceilometerclient/tests/test_http.py
@@ -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')