aboutsummaryrefslogtreecommitdiffstats
path: root/keystone-moon/keystone/tests
diff options
context:
space:
mode:
authorasteroide <thomas.duval@orange.com>2016-01-26 09:56:07 +0100
committerasteroide <thomas.duval@orange.com>2016-01-26 09:56:07 +0100
commitdee112e2c8a032cc5cb4583ba0e91323a85fab48 (patch)
tree5a712ee7a291b372047fba8ac332ef058dd73ef5 /keystone-moon/keystone/tests
parent721f7d3e5fc68913fe6ee3d06959c5cc45f50aa1 (diff)
Add the Moon slave service.
Change-Id: Iaf2e154af685b611e6ec19f2500bb8720d8447bd
Diffstat (limited to 'keystone-moon/keystone/tests')
-rw-r--r--keystone-moon/keystone/tests/moon/unit/__init__.py1
-rw-r--r--keystone-moon/keystone/tests/moon/unit/test_unit_core_configuration.py3
-rw-r--r--keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_admin.py6
-rw-r--r--keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_authz.py6
-rw-r--r--keystone-moon/keystone/tests/moon/unit/test_unit_core_log.py3
-rw-r--r--keystone-moon/keystone/tests/moon/unit/test_unit_core_tenant.py3
6 files changed, 15 insertions, 7 deletions
diff --git a/keystone-moon/keystone/tests/moon/unit/__init__.py b/keystone-moon/keystone/tests/moon/unit/__init__.py
index bf3c1d1e..d801d015 100644
--- a/keystone-moon/keystone/tests/moon/unit/__init__.py
+++ b/keystone-moon/keystone/tests/moon/unit/__init__.py
@@ -26,6 +26,7 @@ def create_intra_extension(self, policy_model="policy_authz"):
IE["genre"] = genre
ref = self.admin_api.load_intra_extension_dict(self.root_api.root_admin_id,
intra_extension_dict=IE)
+ self.admin_api.populate_default_data(ref)
self.assertIsInstance(ref, dict)
return ref
diff --git a/keystone-moon/keystone/tests/moon/unit/test_unit_core_configuration.py b/keystone-moon/keystone/tests/moon/unit/test_unit_core_configuration.py
index 8bd6cb4f..9775047d 100644
--- a/keystone-moon/keystone/tests/moon/unit/test_unit_core_configuration.py
+++ b/keystone-moon/keystone/tests/moon/unit/test_unit_core_configuration.py
@@ -30,7 +30,8 @@ class TestConfigurationManager(tests.TestCase):
self.resource_api.create_domain(domain['id'], domain)
self.admin = create_user(self, username="admin")
self.demo = create_user(self, username="demo")
- self.root_api.load_root_intra_extension_dict()
+ ref = self.root_api.load_root_intra_extension_dict()
+ self.root_api.populate_default_data(ref)
self.root_intra_extension = self.root_api.get_root_extension_dict()
self.root_intra_extension_id = self.root_intra_extension.keys()[0]
self.ADMIN_ID = self.root_api.root_admin_id
diff --git a/keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_admin.py b/keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_admin.py
index d3f088c0..ca6ef93e 100644
--- a/keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_admin.py
+++ b/keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_admin.py
@@ -43,7 +43,8 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase):
self.resource_api.create_domain(domain['id'], domain)
self.admin = create_user(self, username="admin")
self.demo = create_user(self, username="demo")
- self.root_api.load_root_intra_extension_dict()
+ ref = self.root_api.load_root_intra_extension_dict()
+ self.root_api.populate_default_data(ref)
self.root_intra_extension = self.root_api.get_root_extension_dict()
self.root_intra_extension_id = self.root_intra_extension.keys()[0]
self.ADMIN_ID = self.root_api.root_admin_id
@@ -965,7 +966,8 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
self.resource_api.create_domain(domain['id'], domain)
self.admin = create_user(self, username="admin")
self.demo = create_user(self, username="demo")
- self.root_api.load_root_intra_extension_dict()
+ ref = self.root_api.load_root_intra_extension_dict()
+ self.root_api.populate_default_data(ref)
self.root_intra_extension = self.root_api.get_root_extension_dict()
self.root_intra_extension_id = self.root_intra_extension.keys()[0]
self.ADMIN_ID = self.root_api.root_admin_id
diff --git a/keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_authz.py b/keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_authz.py
index 172c6b6d..8fa46268 100644
--- a/keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_authz.py
+++ b/keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_authz.py
@@ -41,7 +41,8 @@ class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
self.resource_api.create_domain(domain['id'], domain)
self.admin = create_user(self, username="admin")
self.demo = create_user(self, username="demo")
- self.root_api.load_root_intra_extension_dict()
+ ref = self.root_api.load_root_intra_extension_dict()
+ self.root_api.populate_default_data(ref)
self.root_intra_extension = self.root_api.get_root_extension_dict()
self.root_intra_extension_id = self.root_intra_extension.keys()[0]
self.ADMIN_ID = self.root_api.root_admin_id
@@ -946,7 +947,8 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
self.resource_api.create_domain(domain['id'], domain)
self.admin = create_user(self, username="admin")
self.demo = create_user(self, username="demo")
- self.root_api.load_root_intra_extension_dict()
+ ref = self.root_api.load_root_intra_extension_dict()
+ self.root_api.populate_default_data(ref)
self.root_intra_extension = self.root_api.get_root_extension_dict()
self.root_intra_extension_id = self.root_intra_extension.keys()[0]
self.ADMIN_ID = self.root_api.root_admin_id
diff --git a/keystone-moon/keystone/tests/moon/unit/test_unit_core_log.py b/keystone-moon/keystone/tests/moon/unit/test_unit_core_log.py
index 7d205bc9..143e7c8b 100644
--- a/keystone-moon/keystone/tests/moon/unit/test_unit_core_log.py
+++ b/keystone-moon/keystone/tests/moon/unit/test_unit_core_log.py
@@ -44,7 +44,8 @@ class TestIntraExtensionAdminManager(tests.TestCase):
self.resource_api.create_domain(domain['id'], domain)
self.admin = create_user(self, username="admin")
self.demo = create_user(self, username="demo")
- self.root_api.load_root_intra_extension_dict()
+ ref = self.root_api.load_root_intra_extension_dict()
+ self.root_api.populate_default_data(ref)
self.root_intra_extension = self.root_api.get_root_extension_dict()
self.root_intra_extension_id = self.root_intra_extension.keys()[0]
self.ADMIN_ID = self.root_api.root_admin_id
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 a74bc240..c2f60424 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
@@ -43,7 +43,8 @@ class TestTenantManager(tests.TestCase):
self.resource_api.create_domain(domain['id'], domain)
self.admin = create_user(self, username="admin")
self.demo = create_user(self, username="demo")
- self.root_api.load_root_intra_extension_dict()
+ ref = self.root_api.load_root_intra_extension_dict()
+ self.root_api.populate_default_data(ref)
self.root_intra_extension = self.root_api.get_root_extension_dict()
self.root_intra_extension_id = self.root_intra_extension.keys()[0]
self.ADMIN_ID = self.root_api.root_admin_id