diff options
| author |   WuKong <rebirthmonkey@gmail.com> | 2015-07-16 18:06:45 +0200 |
|---|---|---|
| committer | WuKong <rebirthmonkey@gmail.com> | 2015-07-16 18:06:45 +0200 |
| commit | 0e4a78d142013af0d1530db688350a83d5d65051 (patch) | |
| tree | b8ec692967bff0ef7ceeca24ea6f72ae214b22fd /keystone-moon/keystone/tests/moon/unit/test_unit_core_tenant.py | |
| parent | c10edf3198cda970331bdf6b60166aa8fb611888 (diff) | |
reivew code
Change-Id: I912698ca09a6c1161c02502a7ea551a5ee905949
Signed-off-by: WuKong <rebirthmonkey@gmail.com>
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.py | 6 |
1 files changed, 3 insertions, 3 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 615b8bbc..bc34feaa 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 @@ -89,7 +89,7 @@ class TestTenantManager(tests.TestCase): data = self.manager.set_tenant_name(_uuid, "new name") self.assertEquals(_uuid, data["id"]) self.assertEquals(data["name"], "new name") - data = self.manager.get_tenant_name(_uuid) + data = self.manager.get_tenant_name_from_id(_uuid) self.assertEquals(data, "new name") def test_delete_tenant(self): @@ -139,7 +139,7 @@ class TestTenantManager(tests.TestCase): self.assertEqual(data, new_mapping[_uuid]["admin"]) def test_unkown_tenant_uuid(self): - self.assertRaises(TenantIDNotFound, self.manager.get_tenant_name, uuid.uuid4().hex) + 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) _uuid = uuid.uuid4().hex @@ -157,6 +157,6 @@ class TestTenantManager(tests.TestCase): intra_admin_ext_id="" ) self.assertEquals(_uuid, data["id"]) - self.assertRaises(IntraExtensionNotFound, self.manager.get_extension_id, _uuid, "admin") + self.assertRaises(IntraExtensionUnknown, self.manager.get_extension_id, _uuid, "admin") self.assertRaises(TenantIDNotFound, self.manager.get_tenant_uuid, uuid.uuid4().hex) # self.assertRaises(AdminIntraExtensionNotFound, self.manager.get_admin_extension_uuid, uuid.uuid4().hex) |