Merge "MH plugin tests - remove directory._instance"

This commit is contained in:
Jenkins 2016-12-11 08:31:07 +00:00 committed by Gerrit Code Review
commit 70617cf3fb

View File

@ -13,8 +13,6 @@
# under the License.
#
import fixtures
import mock
from neutron.tests import base
from oslo_config import cfg
@ -75,9 +73,6 @@ class ConfigurationTest(base.BaseTestCase):
def setUp(self):
super(ConfigurationTest, self).setUp()
self.useFixture(fixtures.MonkeyPatch(
'neutron_lib.plugins.directory._instance',
None))
# Avoid runs of the synchronizer looping call
patch_sync = mock.patch.object(sync, '_start_loopingcall')
patch_sync.start()
@ -240,9 +235,6 @@ class OldNVPConfigurationTest(base.BaseTestCase):
def setUp(self):
super(OldNVPConfigurationTest, self).setUp()
self.useFixture(fixtures.MonkeyPatch(
'neutron_lib.plugins.directory._instance',
None))
# Avoid runs of the synchronizer looping call
patch_sync = mock.patch.object(sync, '_start_loopingcall')
patch_sync.start()