summaryrefslogtreecommitdiff
path: root/tests/utils.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/utils.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/utils.py')
-rw-r--r--tests/utils.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/utils.py b/tests/utils.py
index ea6aeb3..570c2ea 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -16,11 +16,13 @@ from httplib import HTTPException
from eventlet import Timeout, sleep
-def fake_get_keystoneclient_2_0(os_options):
+def fake_get_keystoneclient_2_0(os_options, exc=None):
def fake_get_keystoneclient_2_0(auth_url,
user,
key,
actual_os_options):
+ if exc:
+ raise exc('test')
if actual_os_options != os_options:
return "", None
return ("http://url/", "token")