From 1c6b51259cd4dcb82fd568c260ca7a17bbb29922 Mon Sep 17 00:00:00 2001 From: IWAMOTO Toshihiro Date: Thu, 8 Jun 2017 16:36:31 +0900 Subject: [PATCH] python3: Do not pass MagicMock as ConfigOpts Doing so causes a eventlet.sleep(MagicMock()) call, which results in comparing MagicMock with float and generates a TypeError in python3. Change-Id: I970c215433fda05fa4570b2250a36aab4c18c616 --- neutron/tests/functional/agent/l3/test_namespace_manager.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neutron/tests/functional/agent/l3/test_namespace_manager.py b/neutron/tests/functional/agent/l3/test_namespace_manager.py index 6db959c850d..9a5e801c142 100644 --- a/neutron/tests/functional/agent/l3/test_namespace_manager.py +++ b/neutron/tests/functional/agent/l3/test_namespace_manager.py @@ -14,6 +14,7 @@ # under the License. import mock +from oslo_config import cfg from oslo_utils import uuidutils from neutron.agent.l3 import dvr_snat_ns @@ -29,7 +30,7 @@ class NamespaceManagerTestFramework(base.BaseSudoTestCase): def setUp(self): super(NamespaceManagerTestFramework, self).setUp() - self.agent_conf = mock.MagicMock() + self.agent_conf = cfg.CONF self.metadata_driver_mock = mock.Mock() self.namespace_manager = namespace_manager.NamespaceManager( self.agent_conf, driver=None,