summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortermie <github@anarkystic.com>2012-01-23 14:30:22 -0800
committertermie <github@anarkystic.com>2012-01-23 14:30:22 -0800
commit86dad078f4b4b6db49e63578ee809e08d92fcfdb (patch)
tree035d2e2422109275a84e07d6d86414f573e5e286
parent507d5f2de39abee3b9cd0786e0f6d95875ccc929 (diff)
downloadkeystone-86dad078f4b4b6db49e63578ee809e08d92fcfdb.tar.gz
keystone-86dad078f4b4b6db49e63578ee809e08d92fcfdb.tar.xz
keystone-86dad078f4b4b6db49e63578ee809e08d92fcfdb.zip
fix user_get/user_list tests
-rw-r--r--tests/test_keystoneclient.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py
index 043633bf..e84afb88 100644
--- a/tests/test_keystoneclient.py
+++ b/tests/test_keystoneclient.py
@@ -193,7 +193,6 @@ class KcMasterTestCase(CompatTestCase):
username=self.user_foo['name'],
password='invalid')
-
def test_user_create_update_delete(self):
from keystoneclient import exceptions as client_exceptions
@@ -239,15 +238,12 @@ class KcMasterTestCase(CompatTestCase):
users = client.users.list()
self.assertTrue(len(users) > 0)
user = users[0]
- with self.assertRaises(AttributeError):
- user.password
+ self.assertRaises(AttributeError, lambda: user.password)
def test_user_get(self):
client = self.get_client()
user = client.users.get(self.user_foo['id'])
- with self.assertRaises(AttributeError):
- user.password
-
+ self.assertRaises(AttributeError, lambda: user.password)
def test_role_get(self):
client = self.get_client()