openstack/neutron
Code Issues Proposed changes

Merge "Fix the ImportErrors in l3 and dhcp scheduler functional tests"

Browse Source
This commit is contained in:
Jenkins 2015-04-14 19:29:28 +00:00 committed by Gerrit Code Review
commit 53f53b1a37
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/tests/functional/agent/test_l3_agent.py
View File

@ -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

3
neutron/tests/functional/scheduler/test_dhcp_agent_scheduler.py
View File

@ -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.