From bb0b48816807fffce723600e72c416ef143759e0 Mon Sep 17 00:00:00 2001 From: Shiv Haris Date: Mon, 9 Feb 2015 12:04:34 -0800 Subject: [PATCH] Fix unit test paths Fixes: Bug #1419953 Change-Id: Id81ae3fc5b309d4ccb0010a59678ad987338ece4 --- .testr.conf | 2 +- __init__.py | 0 networking_brocade/mlx/__init__.py | 19 ------------------- networking_brocade/vdx/__init__.py | 0 networking_brocade/vdx/tests/__init__.py | 0 .../vdx/tests/unit/ml2/__init__.py | 0 .../vdx/tests/unit/ml2/drivers/__init__.py | 0 .../brocade/test_brocade_mechanism_driver.py | 9 +++++---- networking_brocade/vyatta/__init__.py | 19 ------------------- 9 files changed, 6 insertions(+), 43 deletions(-) create mode 100644 __init__.py create mode 100644 networking_brocade/vdx/__init__.py create mode 100644 networking_brocade/vdx/tests/__init__.py create mode 100644 networking_brocade/vdx/tests/unit/ml2/__init__.py create mode 100644 networking_brocade/vdx/tests/unit/ml2/drivers/__init__.py diff --git a/.testr.conf b/.testr.conf index 6d83b3c..13f2765 100644 --- a/.testr.conf +++ b/.testr.conf @@ -2,6 +2,6 @@ test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \ - ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION + ${PYTHON:-python} -m subunit.run discover -t ./ ./networking_brocade/tests $LISTOPT $IDOPTION test_id_option=--load-list $IDFILE test_list_option=--list diff --git a/__init__.py b/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/networking_brocade/mlx/__init__.py b/networking_brocade/mlx/__init__.py index 2212d63..e69de29 100644 --- a/networking_brocade/mlx/__init__.py +++ b/networking_brocade/mlx/__init__.py @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- - -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import pbr.version - - -__version__ = pbr.version.VersionInfo( - 'networking_brocade').version_string() diff --git a/networking_brocade/vdx/__init__.py b/networking_brocade/vdx/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/networking_brocade/vdx/tests/__init__.py b/networking_brocade/vdx/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/networking_brocade/vdx/tests/unit/ml2/__init__.py b/networking_brocade/vdx/tests/unit/ml2/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/networking_brocade/vdx/tests/unit/ml2/drivers/__init__.py b/networking_brocade/vdx/tests/unit/ml2/drivers/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/networking_brocade/vdx/tests/unit/ml2/drivers/brocade/test_brocade_mechanism_driver.py b/networking_brocade/vdx/tests/unit/ml2/drivers/brocade/test_brocade_mechanism_driver.py index c1b5467..4845a22 100644 --- a/networking_brocade/vdx/tests/unit/ml2/drivers/brocade/test_brocade_mechanism_driver.py +++ b/networking_brocade/vdx/tests/unit/ml2/drivers/brocade/test_brocade_mechanism_driver.py @@ -16,14 +16,15 @@ import mock from neutron.openstack.common import log as logging from neutron.plugins.ml2 import config as ml2_config -from neutron.plugins.ml2.drivers.brocade import (mechanism_brocade - as brocademechanism) from neutron.tests.unit.ml2 import test_ml2_plugin from oslo.utils import importutils +from vendor.brocade.networking_brocade.vdx.ml2driver import ( + mechanism_brocade as brocademechanism) LOG = logging.getLogger(__name__) -MECHANISM_NAME = ('neutron.plugins.ml2.' - 'drivers.brocade.mechanism_brocade.BrocadeMechanism') + +MECHANISM_NAME = ('vendor.brocade.networking_brocade.' + 'vdx.ml2driver.mechanism_brocade.BrocadeMechanism') class TestBrocadeMechDriverV2(test_ml2_plugin.Ml2PluginV2TestCase): diff --git a/networking_brocade/vyatta/__init__.py b/networking_brocade/vyatta/__init__.py index 2212d63..e69de29 100644 --- a/networking_brocade/vyatta/__init__.py +++ b/networking_brocade/vyatta/__init__.py @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- - -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import pbr.version - - -__version__ = pbr.version.VersionInfo( - 'networking_brocade').version_string()