diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2018-01-11 22:25:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-11 22:25:06 +0000 |
| commit | 10c40df0e3eb26ec2699a869772622a88a3ef601 (patch) | |
| tree | 416a8b57d8fbcc61b8ea2b03ebf9b26a1e115225 | |
| parent | e11caa14f51beaa88c1cf6fda216a5f62cefb72d (diff) | |
| parent | 11802c9ec469ab570dace176c18093bc655561a2 (diff) | |
Merge "Move tests: functional/"
| -rwxr-xr-x | tests/functional/__init__.py | 0 | ||||
| -rwxr-xr-x | tools/run_tests.sh | 1 | ||||
| -rwxr-xr-x | yardstick/tests/functional/test_cli_runner.py (renamed from tests/functional/test_cli_runner.py) | 4 | ||||
| -rwxr-xr-x | yardstick/tests/functional/test_cli_scenario.py (renamed from tests/functional/test_cli_scenario.py) | 4 | ||||
| -rwxr-xr-x | yardstick/tests/functional/utils.py (renamed from tests/functional/utils.py) | 0 |
5 files changed, 2 insertions, 7 deletions
diff --git a/tests/functional/__init__.py b/tests/functional/__init__.py deleted file mode 100755 index e69de29bb..000000000 --- a/tests/functional/__init__.py +++ /dev/null diff --git a/tools/run_tests.sh b/tools/run_tests.sh index ddb5e55af..633c93859 100755 --- a/tools/run_tests.sh +++ b/tools/run_tests.sh @@ -56,7 +56,6 @@ run_functional_test() { mkdir -p .testrepository python -m subunit.run discover yardstick/tests/functional > .testrepository/subunit.log - python -m subunit.run discover tests/functional >> .testrepository/subunit.log subunit2pyunit < .testrepository/subunit.log EXIT_CODE=$? diff --git a/tests/functional/test_cli_runner.py b/yardstick/tests/functional/test_cli_runner.py index 620edc396..2f2d7fef2 100755 --- a/tests/functional/test_cli_runner.py +++ b/yardstick/tests/functional/test_cli_runner.py @@ -7,11 +7,9 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## - -from __future__ import absolute_import import unittest -from tests.functional import utils +from yardstick.tests.functional import utils class RunnerTestCase(unittest.TestCase): diff --git a/tests/functional/test_cli_scenario.py b/yardstick/tests/functional/test_cli_scenario.py index 63b533b85..7aaacad0a 100755 --- a/tests/functional/test_cli_scenario.py +++ b/yardstick/tests/functional/test_cli_scenario.py @@ -7,11 +7,9 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## - -from __future__ import absolute_import import unittest -from tests.functional import utils +from yardstick.tests.functional import utils class ScenarioTestCase(unittest.TestCase): diff --git a/tests/functional/utils.py b/yardstick/tests/functional/utils.py index d889c0dfa..d889c0dfa 100755 --- a/tests/functional/utils.py +++ b/yardstick/tests/functional/utils.py |