summaryrefslogtreecommitdiff
path: root/tests/test_swiftclient.py
diff options
context:
space:
mode:
authorDonagh McCabe <donagh.mccabe@hp.com>2012-09-05 15:55:53 +0100
committerDonagh McCabe <donagh.mccabe@hp.com>2012-09-11 09:26:12 +0100
commit68d1550f15a6ec6f51973af2e27f3a6943b6305f (patch)
tree6feabf40aac7571cf8e9522842fa01f4df41420d /tests/test_swiftclient.py
parent4b4fbf0dc0d2e918b88c1e387f462faca7e98ffd (diff)
downloadpython-swiftclient-1.2.0.tar.gz
Add region_name support1.2.0
Add --os-region-name (and OS_REGION_NAME env) to bin/swift Add region_name to the os_options in Connection class. bug 1019832 Change-Id: Id8515d97e5351638dce10581c7368f61518e1fa7
Diffstat (limited to 'tests/test_swiftclient.py')
-rw-r--r--tests/test_swiftclient.py19
1 files changed, 19 insertions, 0 deletions
diff --git a/tests/test_swiftclient.py b/tests/test_swiftclient.py
index 0584d39..08bf6cc 100644
--- a/tests/test_swiftclient.py
+++ b/tests/test_swiftclient.py
@@ -220,6 +220,25 @@ class TestGetAuth(MockHttpTest):
self.assertTrue(url.startswith("http"))
self.assertTrue(token)
+ def test_auth_v2_with_os_region_name(self):
+ os_options={'region_name': 'good-region',
+ 'tenant_name': 'asdf'}
+ c.get_keystoneclient_2_0 = fake_get_keystoneclient_2_0(os_options)
+ url, token = c.get_auth('http://www.test.com', 'asdf', 'asdf',
+ os_options=os_options,
+ auth_version="2.0")
+ self.assertTrue(url.startswith("http"))
+ self.assertTrue(token)
+
+ def test_auth_v2_no_endpoint(self):
+ os_options={'region_name': 'unknown_region',
+ 'tenant_name': 'asdf'}
+ c.get_keystoneclient_2_0 = fake_get_keystoneclient_2_0(
+ os_options,
+ c.ClientException)
+ self.assertRaises(c.ClientException, c.get_auth,
+ 'http://www.tests.com', 'asdf', 'asdf',
+ os_options=os_options, auth_version='2.0')
class TestGetAccount(MockHttpTest):