From: Aaron Rosen <arosen@nicira.com>
Date: Wed, 24 Jul 2013 23:35:24 +0000 (-0700)
Subject: Fix test fail in neutron.tests.unit.test_security_groups_rpc
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cce692dc528290dda19ef70b9bb6e2dab5018abd;p=openstack-build%2Fneutron-build.git

Fix test fail in neutron.tests.unit.test_security_groups_rpc

If running:

tox -epy27 neutron.tests.unit.test_security_groups_rpc

Tests fail with: DuplicateOptError: duplicate option: root_helper
as this is already registered and can be removed.

Fixes bug: 1204700

Change-Id: I8b591357988c5546ae55b6531cf1786b7eb84e20
---

diff --git a/neutron/tests/unit/test_security_groups_rpc.py b/neutron/tests/unit/test_security_groups_rpc.py
index 68f278014..0a24b7ad3 100644
--- a/neutron/tests/unit/test_security_groups_rpc.py
+++ b/neutron/tests/unit/test_security_groups_rpc.py
@@ -1110,11 +1110,6 @@ class TestSecurityGroupAgentWithIptables(base.BaseTestCase):
     def setUp(self):
         super(TestSecurityGroupAgentWithIptables, self).setUp()
         self.mox = mox.Mox()
-        agent_opts = [
-            cfg.StrOpt('root_helper', default='sudo'),
-        ]
-
-        cfg.CONF.register_opts(agent_opts, "AGENT")
         cfg.CONF.set_override(
             'firewall_driver',
             self.FIREWALL_DRIVER,