diff options
Diffstat (limited to 'keystone/test.py')
| -rw-r--r-- | keystone/test.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/keystone/test.py b/keystone/test.py index cbe51fb2..9118b2ea 100644 --- a/keystone/test.py +++ b/keystone/test.py @@ -266,7 +266,11 @@ class TestCase(NoModule, unittest.TestCase): # only call load_backends once. dependency.reset() - for manager in [assignment, catalog, credential, ec2, identity, policy, + # NOTE(blk-u): identity must be before assignment to ensure that the + # identity driver is available to the assignment manager because the + # assignment manager gets the default assignment driver from the + # identity driver. + for manager in [identity, assignment, catalog, credential, ec2, policy, token, token_provider, trust]: # manager.__name__ is like keystone.xxx[.yyy], # converted to xxx[_yyy] @@ -276,6 +280,8 @@ class TestCase(NoModule, unittest.TestCase): setattr(self, manager_name, manager.Manager()) + dependency.resolve_future_dependencies() + def load_fixtures(self, fixtures): """Hacky basic and naive fixture loading based on a python module. |