From: Kevin Benton <blak111@gmail.com>
Date: Fri, 26 Jun 2015 01:31:38 +0000 (-0700)
Subject: Remove duplicated call to setup_coreplugin
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ba7d673d1ddd5bfa5aa1be5b26a59e9a8cd78a9f;p=openstack-build%2Fneutron-build.git

Remove duplicated call to setup_coreplugin

The test case for vlan_transparent was calling setup_coreplugin
before calling the super setUp method which already calls
setup_coreplugin. This was causing duplicate core plugin fixtures
which resulted in patching the dhcp periodic check twice.

Change-Id: Ide4efad42748e799d8e9c815480c8ffa94b27b38
Partial-Bug: #1468998
---

diff --git a/neutron/tests/unit/extensions/test_vlantransparent.py b/neutron/tests/unit/extensions/test_vlantransparent.py
index 7d6d99a05..de9c03e06 100644
--- a/neutron/tests/unit/extensions/test_vlantransparent.py
+++ b/neutron/tests/unit/extensions/test_vlantransparent.py
@@ -60,7 +60,6 @@ class VlanTransparentExtensionTestCase(test_db_base_plugin_v2.TestNetworksV2):
             self.saved_attr_map[res] = attrs.copy()
 
         # Update the plugin and extensions path
-        self.setup_coreplugin(plugin)
         cfg.CONF.set_override('allow_pagination', True)
         cfg.CONF.set_override('allow_sorting', True)
         ext_mgr = VlanTransparentExtensionManager()