x/vmware-nsx
Code Issues Proposed changes

Fix Admin utils tests - resources registration

Browse Source 
Commit I8a40f38d7c0e5aeca257ba62115fa9b02ad5aa93 broke our tests

Change-Id: Ib2d92da04efe4d349a041a6a137497cdaed06209
This commit is contained in:
Adit Sarfaty 2016-09-08 12:38:42 +03:00
parent 4bf1a654f1
commit 0bf70acc43
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vmware_nsx/tests/unit/shell/test_admin_utils.py
View File

@ -24,6 +24,7 @@ from oslo_utils import uuidutils
from neutron.callbacks import registry from neutron.callbacks import registry
from neutron.common import config as neutron_config from neutron.common import config as neutron_config
from neutron.db import servicetype_db # noqa from neutron.db import servicetype_db # noqa
from neutron.quota import resource_registry
from neutron.tests import base from neutron.tests import base
from neutron.tests.unit.db import test_db_base_plugin_v2 as test_n_plugin from neutron.tests.unit.db import test_db_base_plugin_v2 as test_n_plugin
@ -48,11 +49,15 @@ class AbstractTestAdminUtils(base.BaseTestCase):
super(AbstractTestAdminUtils, self).setUp() super(AbstractTestAdminUtils, self).setUp()
# remove resource registration conflicts
resource_registry.unregister_all_resources()
# Init the neutron config # Init the neutron config
neutron_config.init(args=['--config-file', BASE_CONF_PATH, neutron_config.init(args=['--config-file', BASE_CONF_PATH,
'--config-file', NSX_INI_PATH]) '--config-file', NSX_INI_PATH])
self._init_mock_plugin() self._init_mock_plugin()
self._init_resource_plugin() self._init_resource_plugin()
self.addCleanup(resource_registry.unregister_all_resources)
@abc.abstractmethod @abc.abstractmethod
def _init_mock_plugin(self): def _init_mock_plugin(self):