aboutsummaryrefslogtreecommitdiffstats
path: root/keystone-moon/keystone/tests/moon/unit/test_unit_core_tenant.py
diff options
context:
space:
mode:
authorasteroide <thomas.duval@orange.com>2015-11-25 10:48:04 +0100
committerasteroide <thomas.duval@orange.com>2015-11-25 10:48:04 +0100
commit56c1deb569cd268c35562ada9a86b6fecf47ceb1 (patch)
tree6622d884ed6d0cab1ede386c64278cbb72c0c323 /keystone-moon/keystone/tests/moon/unit/test_unit_core_tenant.py
parent5cc4124b9e0640318a9ed54896f2ddd2051bebe0 (diff)
Re-run unittests and fix some bugs.
Change-Id: Ibf63942a55bd4c3792bbfb4cd25d665923a3b1af
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.py10
1 files changed, 5 insertions, 5 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 794ececc..99fb5965 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
@@ -74,7 +74,7 @@ class TestTenantManager(tests.TestCase):
def test_add_tenant(self):
authz_intra_extension = create_intra_extension(self, policy_model="policy_authz")
- admin_intra_extension = create_intra_extension(self, policy_model="policy_admin")
+ admin_intra_extension = create_intra_extension(self, policy_model="policy_rbac_admin")
new_tenant = {
"id": uuid.uuid4().hex,
"name": "demo",
@@ -99,7 +99,7 @@ class TestTenantManager(tests.TestCase):
def test_del_tenant(self):
authz_intra_extension = create_intra_extension(self, policy_model="policy_authz")
- admin_intra_extension = create_intra_extension(self, policy_model="policy_admin")
+ admin_intra_extension = create_intra_extension(self, policy_model="policy_rbac_admin")
new_tenant = {
"id": uuid.uuid4().hex,
"name": "demo",
@@ -120,7 +120,7 @@ class TestTenantManager(tests.TestCase):
def test_set_tenant(self):
authz_intra_extension = create_intra_extension(self, policy_model="policy_authz")
- admin_intra_extension = create_intra_extension(self, policy_model="policy_admin")
+ admin_intra_extension = create_intra_extension(self, policy_model="policy_rbac_admin")
new_tenant = {
"id": uuid.uuid4().hex,
"name": "demo",
@@ -150,7 +150,7 @@ class TestTenantManager(tests.TestCase):
self.assertRaises(TenantUnknown, self.tenant_manager.set_tenant_dict, self.ADMIN_ID, uuid.uuid4().hex, {})
authz_intra_extension = create_intra_extension(self, policy_model="policy_authz")
- admin_intra_extension = create_intra_extension(self, policy_model="policy_admin")
+ admin_intra_extension = create_intra_extension(self, policy_model="policy_rbac_admin")
new_tenant = {
"id": uuid.uuid4().hex,
"name": "demo",
@@ -170,7 +170,7 @@ class TestTenantManager(tests.TestCase):
def test_exception_tenant_added_name_existing(self):
authz_intra_extension = create_intra_extension(self, policy_model="policy_authz")
- admin_intra_extension = create_intra_extension(self, policy_model="policy_admin")
+ admin_intra_extension = create_intra_extension(self, policy_model="policy_rbac_admin")
new_tenant = {
"id": uuid.uuid4().hex,
"name": "demo",