Merge "Fix test discovery for api and functional paths"
This commit is contained in:
commit
e51ff45271
|
@ -1,34 +0,0 @@
|
||||||
# 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 unittest
|
|
||||||
|
|
||||||
|
|
||||||
# Allow the retargetable and tempest api tests to be executed as part
|
|
||||||
# of the same job by ensuring that tests from both paths are discovered.
|
|
||||||
|
|
||||||
|
|
||||||
def _discover(loader, path, pattern):
|
|
||||||
return loader.discover(path, pattern=pattern, top_level_dir=".")
|
|
||||||
|
|
||||||
|
|
||||||
def load_tests(_, tests, pattern):
|
|
||||||
suite = unittest.TestSuite()
|
|
||||||
suite.addTests(tests)
|
|
||||||
|
|
||||||
loader = unittest.loader.TestLoader()
|
|
||||||
suite.addTests(_discover(loader, "./neutron/tests/api", pattern))
|
|
||||||
suite.addTests(_discover(loader,
|
|
||||||
"./neutron/tests/retargetable",
|
|
||||||
pattern))
|
|
||||||
|
|
||||||
return suite
|
|
|
@ -19,9 +19,9 @@ import fixtures
|
||||||
import netaddr
|
import netaddr
|
||||||
import six
|
import six
|
||||||
|
|
||||||
|
from neutron.agent.common import ovs_lib
|
||||||
from neutron.agent.linux import bridge_lib
|
from neutron.agent.linux import bridge_lib
|
||||||
from neutron.agent.linux import ip_lib
|
from neutron.agent.linux import ip_lib
|
||||||
from neutron.agent.linux import ovs_lib
|
|
||||||
from neutron.common import constants as n_const
|
from neutron.common import constants as n_const
|
||||||
from neutron.openstack.common import uuidutils
|
from neutron.openstack.common import uuidutils
|
||||||
from neutron.tests import base as tests_base
|
from neutron.tests import base as tests_base
|
||||||
|
|
|
@ -18,21 +18,17 @@ environmental requirements to the functional path are marked for
|
||||||
discovery.
|
discovery.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import unittest
|
import os.path
|
||||||
|
|
||||||
|
|
||||||
def _discover(loader, path, pattern):
|
def load_tests(loader, tests, pattern):
|
||||||
return loader.discover(path, pattern=pattern, top_level_dir=".")
|
this_dir = os.path.dirname(__file__)
|
||||||
|
parent_dir = os.path.dirname(this_dir)
|
||||||
|
target_dirs = [
|
||||||
def load_tests(_, tests, pattern):
|
this_dir,
|
||||||
suite = unittest.TestSuite()
|
os.path.join(parent_dir, 'retargetable'),
|
||||||
suite.addTests(tests)
|
]
|
||||||
|
for start_dir in target_dirs:
|
||||||
loader = unittest.loader.TestLoader()
|
new_tests = loader.discover(start_dir=start_dir, pattern=pattern)
|
||||||
suite.addTests(_discover(loader, "./neutron/tests/functional", pattern))
|
tests.addTests(new_tests)
|
||||||
suite.addTests(_discover(loader, "./neutron/tests/fullstack", pattern))
|
return tests
|
||||||
suite.addTests(_discover(loader, "./neutron/tests/retargetable",
|
|
||||||
pattern))
|
|
||||||
|
|
||||||
return suite
|
|
||||||
|
|
Loading…
Reference in New Issue