From 4ee8ac892dd856e960fa9031ed6c9d1df213dadc Mon Sep 17 00:00:00 2001 From: Numan Siddique Date: Mon, 13 Apr 2015 20:52:33 +0530 Subject: [PATCH] Fix the ImportErrors in l3 and dhcp scheduler functional tests Change-Id: I5b8746d37173869f78a9c23834f10d630d2a36cd Closes-bug: #1443480 (cherry picked from commit 791d57922b00857e3f8bb753bff9499f3c4e1ab9) --- neutron/tests/functional/agent/test_l3_agent.py | 2 +- .../tests/functional/scheduler/test_dhcp_agent_scheduler.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/neutron/tests/functional/agent/test_l3_agent.py b/neutron/tests/functional/agent/test_l3_agent.py index 0d8b31c12..909ac591e 100755 --- a/neutron/tests/functional/agent/test_l3_agent.py +++ b/neutron/tests/functional/agent/test_l3_agent.py @@ -48,7 +48,7 @@ from neutron.openstack.common import uuidutils from neutron.tests.common import net_helpers from neutron.tests.functional.agent.linux import base from neutron.tests.functional.agent.linux import helpers -from neutron.tests.unit import test_l3_agent +from neutron.tests.unit.agent.l3 import test_agent as test_l3_agent LOG = logging.getLogger(__name__) _uuid = uuidutils.generate_uuid diff --git a/neutron/tests/functional/scheduler/test_dhcp_agent_scheduler.py b/neutron/tests/functional/scheduler/test_dhcp_agent_scheduler.py index 964654204..0b0c7d9fd 100644 --- a/neutron/tests/functional/scheduler/test_dhcp_agent_scheduler.py +++ b/neutron/tests/functional/scheduler/test_dhcp_agent_scheduler.py @@ -21,7 +21,8 @@ from neutron.db import agents_db from neutron.db import agentschedulers_db from neutron.db import common_db_mixin from neutron.scheduler import dhcp_agent_scheduler -from neutron.tests.unit import test_dhcp_scheduler as test_dhcp_sch +from neutron.tests.unit.scheduler import (test_dhcp_agent_scheduler as + test_dhcp_sch) from operator import attrgetter # Required to generate tests from scenarios. Not compatible with nose. -- 2.45.2