summaryrefslogtreecommitdiffstats
path: root/keystone-moon/keystone/tests/moon/unit/test_unit_core_tenant.py
diff options
context:
space:
mode:
authorasteroide <thomas.duval@orange.com>2015-07-22 15:34:04 +0200
committerasteroide <thomas.duval@orange.com>2015-07-22 15:34:04 +0200
commit9e3568e0e3da0be4802adb1204d082c88e9ce12c (patch)
treecc9c4a12a09d7ca29a1418ab5ac2d7fb45e59283 /keystone-moon/keystone/tests/moon/unit/test_unit_core_tenant.py
parent9fdb85c4f4867d0bcbe71f37fd8b1d40d6178747 (diff)
Fix bugs by executing tests (need more work)
Change-Id: I4ab59ab0e9269568e26e48c6364a636e9b5088f1
Diffstat (limited to 'keystone-moon/keystone/tests/moon/unit/test_unit_core_tenant.py')
-rw-r--r--keystone-moon/keystone/tests/moon/unit/test_unit_core_tenant.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/keystone-moon/keystone/tests/moon/unit/test_unit_core_tenant.py b/keystone-moon/keystone/tests/moon/unit/test_unit_core_tenant.py
index 2ac70f6e..dda1cac8 100644
--- a/keystone-moon/keystone/tests/moon/unit/test_unit_core_tenant.py
+++ b/keystone-moon/keystone/tests/moon/unit/test_unit_core_tenant.py
@@ -135,9 +135,9 @@ class TestTenantManager(tests.TestCase):
self.assertEqual(data, new_mapping[_uuid]["admin"])
def test_exception_tenantunknown(self):
- self.assertRaises(TenantIDNotFound, self.manager.get_tenant_name_from_id, uuid.uuid4().hex)
- self.assertRaises(TenantIDNotFound, self.manager.set_tenant_name, uuid.uuid4().hex, "new name")
- self.assertRaises(TenantIDNotFound, self.manager.get_extension_id, uuid.uuid4().hex)
+ self.assertRaises(TenantNotFound, self.manager.get_tenant_name_from_id, uuid.uuid4().hex)
+ self.assertRaises(TenantNotFound, self.manager.set_tenant_name, uuid.uuid4().hex, "new name")
+ self.assertRaises(TenantNotFound, self.manager.get_extension_id, uuid.uuid4().hex)
_uuid = uuid.uuid4().hex
new_mapping = {
_uuid: {
@@ -154,7 +154,7 @@ class TestTenantManager(tests.TestCase):
)
self.assertEquals(_uuid, data["id"])
self.assertRaises(IntraExtensionUnknown, self.manager.get_extension_id, _uuid, "admin")
- self.assertRaises(TenantIDNotFound, self.manager.get_tenant_uuid, uuid.uuid4().hex)
+ self.assertRaises(TenantNotFound, self.manager.get_tenant_uuid, uuid.uuid4().hex)
# self.assertRaises(AdminIntraExtensionNotFound, self.manager.get_admin_extension_uuid, uuid.uuid4().hex)
def test_exception_tenantaddednameexisting(self):