summaryrefslogtreecommitdiffstats
path: root/tests/unit
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-08-16 01:25:24 +0000
committerGerrit Code Review <review@openstack.org>2013-08-16 01:25:24 +0000
commit507f69919e78e74b1385ea359dab3a9454017008 (patch)
treeb3584d06fa6c98bb777ec4aea971fd117a712d35 /tests/unit
parent56709a59b763a27eab7dc2abacc09e37a5bd1e0f (diff)
parenteaec23b7ca0f4f52aec643db158c22f0af0d70c1 (diff)
downloadoslo-507f69919e78e74b1385ea359dab3a9454017008.tar.gz
oslo-507f69919e78e74b1385ea359dab3a9454017008.tar.xz
oslo-507f69919e78e74b1385ea359dab3a9454017008.zip
Merge "py3kcompat: Add urljoin compatibility"
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/test_compat.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/unit/test_compat.py b/tests/unit/test_compat.py
index 2e08f37..5c3d9e5 100644
--- a/tests/unit/test_compat.py
+++ b/tests/unit/test_compat.py
@@ -26,6 +26,12 @@ class CompatTestCase(utils.BaseTestCase):
result = urlutils.urlencode({'Fake': fake})
self.assertEquals(result, 'Fake=fake')
+ def test_urljoin(self):
+ root_url = "http://yahoo.com/"
+ url2 = "faq.html"
+ result = urlutils.urljoin(root_url, url2)
+ self.assertEquals(result, "http://yahoo.com/faq.html")
+
def test_urlquote(self):
url = "/~fake"
result = urlutils.quote(url)