From 11802c9ec469ab570dace176c18093bc655561a2 Mon Sep 17 00:00:00 2001
From: Emma Foley <emma.l.foley@intel.com>
Date: Wed, 29 Nov 2017 23:02:43 +0000
Subject: [PATCH] Move tests: functional/
All tests in tests/functional have been moved to yardstick/tests/functional
JIRA: YARDSTICK-837
Change-Id: I89276b36635de74dd7b8f70e961c71aa0d2c494e
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
---
tests/functional/__init__.py | 0
tools/run_tests.sh | 1 -
{tests => yardstick/tests}/functional/test_cli_runner.py | 4 +---
{tests => yardstick/tests}/functional/test_cli_scenario.py | 4 +---
{tests => yardstick/tests}/functional/utils.py | 0
5 files changed, 2 insertions(+), 7 deletions(-)
delete mode 100755 tests/functional/__init__.py
rename {tests => yardstick/tests}/functional/test_cli_runner.py (95%)
rename {tests => yardstick/tests}/functional/test_cli_scenario.py (96%)
rename {tests => yardstick/tests}/functional/utils.py (100%)
diff --git a/tests/functional/__init__.py b/tests/functional/__init__.py
deleted file mode 100755
index e69de29bb..000000000
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
similarity index 95%
rename from tests/functional/test_cli_runner.py
rename to 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
similarity index 96%
rename from tests/functional/test_cli_scenario.py
rename to 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
similarity index 100%
rename from tests/functional/utils.py
rename to yardstick/tests/functional/utils.py
--
2.16.6