diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-26 22:33:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-26 22:33:26 +0000 |
| commit | 686ec45dfd9dc7b1a830ec32accd3b68ab7adbbe (patch) | |
| tree | 17d8925d57ec7b339f6a5e4dd983a623c16f3ca6 /nova/tests | |
| parent | e60dfc1850fdbe6285c938a0637755eaffda250c (diff) | |
| parent | 98851c82fd9fab193e034e8fe3b13e249f3b53bd (diff) | |
Merge "Converting accounts resource to admin extension"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/v2/contrib/test_accounts.py (renamed from nova/tests/api/openstack/v2/test_accounts.py) | 2 | ||||
| -rw-r--r-- | nova/tests/api/openstack/v2/test_extensions.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nova/tests/api/openstack/v2/test_accounts.py b/nova/tests/api/openstack/v2/contrib/test_accounts.py index bf97c0f98..f799853dc 100644 --- a/nova/tests/api/openstack/v2/test_accounts.py +++ b/nova/tests/api/openstack/v2/contrib/test_accounts.py @@ -20,7 +20,7 @@ from lxml import etree import webob from nova import test -from nova.api.openstack.v2 import accounts +from nova.api.openstack.v2.contrib import accounts from nova.auth.manager import User from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/v2/test_extensions.py b/nova/tests/api/openstack/v2/test_extensions.py index 2063e6e2d..7b9a46a93 100644 --- a/nova/tests/api/openstack/v2/test_extensions.py +++ b/nova/tests/api/openstack/v2/test_extensions.py @@ -98,6 +98,7 @@ class ExtensionControllerTest(ExtensionTestCase): super(ExtensionControllerTest, self).setUp() self.flags(allow_admin_api=True) self.ext_list = [ + "Accounts", "AdminActions", "Console_output", "Createserverext", |