diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-26 22:53:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-26 22:53:26 +0000 |
| commit | cff2ddcbd532ed54d60dbfbdbb7720f4634487b9 (patch) | |
| tree | c22be926054ef130dfacff0883ff9416a5e51235 /nova/tests | |
| parent | db7414235e14545cacf3701b85bf4b5cbb8b925a (diff) | |
| parent | 5682d2a27b252c1aca294eb8a0749ff3fbb13b26 (diff) | |
Merge "Convering /users to admin extension"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/v2/contrib/test_users.py (renamed from nova/tests/api/openstack/v2/test_users.py) | 6 | ||||
| -rw-r--r-- | nova/tests/api/openstack/v2/test_extensions.py | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/nova/tests/api/openstack/v2/test_users.py b/nova/tests/api/openstack/v2/contrib/test_users.py index b6af802f8..24a14e250 100644 --- a/nova/tests/api/openstack/v2/test_users.py +++ b/nova/tests/api/openstack/v2/contrib/test_users.py @@ -15,11 +15,11 @@ from lxml import etree -from nova import test -from nova import utils -from nova.api.openstack.v2 import users +from nova.api.openstack.v2.contrib import users from nova.auth.manager import User, Project +from nova import test from nova.tests.api.openstack import fakes +from nova import utils def fake_init(self): diff --git a/nova/tests/api/openstack/v2/test_extensions.py b/nova/tests/api/openstack/v2/test_extensions.py index 7b9a46a93..ad017e665 100644 --- a/nova/tests/api/openstack/v2/test_extensions.py +++ b/nova/tests/api/openstack/v2/test_extensions.py @@ -118,6 +118,7 @@ class ExtensionControllerTest(ExtensionTestCase): "ServerActionList", "ServerDiagnostics", "SimpleTenantUsage", + "Users", "VSAs", "VirtualInterfaces", "Volumes", |