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>

diff --git a/tests/functional/__init__.py b/tests/functional/__init__.py
deleted file mode 100755 (executable)
index e69de29..0000000

diff --git a/tools/run_tests.sh b/tools/run_tests.sh
index ddb5e55..633c938 100755 (executable)
--- 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 620edc3..2f2d7fe 100755 (executable)
--- 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 63b533b..7aaacad 100755 (executable)
--- 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