From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 15 Apr 2015 00:40:46 +0000 (+0000)
Subject: Merge "Fix intermittent ipset_manager test failure"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8e3f19ce0a03ef7b504d42bcadb642e70d08734f;p=openstack-build%2Fneutron-build.git

Merge "Fix intermittent ipset_manager test failure"
---

8e3f19ce0a03ef7b504d42bcadb642e70d08734f
diff --cc neutron/tests/unit/agent/linux/test_ipset_manager.py
index a06aea5de,ff6010b5f..e449308b5
--- a/neutron/tests/unit/agent/linux/test_ipset_manager.py
+++ b/neutron/tests/unit/agent/linux/test_ipset_manager.py
@@@ -26,8 -27,9 +26,8 @@@ FAKE_IPS = ['10.0.0.1', '10.0.0.2', '10
  
  
  class BaseIpsetManagerTest(base.BaseTestCase):
-     def setUp(self, maxelem=None, hashsize=None):
+     def setUp(self, maxelem, hashsize):
          super(BaseIpsetManagerTest, self).setUp()
 -        cfg.CONF.register_opts(a_cfg.IPSET_OPTS, 'AGENT')
          cfg.CONF.set_override('ipset_maxelem', maxelem, 'AGENT')
          cfg.CONF.set_override('ipset_hashsize', hashsize, 'AGENT')
          self.maxelem = maxelem