tests: moved tests under directory 'tests'

Also renamed directories to be more consistent. Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2019-11-18 16:34:11 +01:00 · 2019-11-18 16:34:11 +01:00 · cff78c537c
commit cff78c537c
parent 98ada2ba71
37 changed files with 4 additions and 4 deletions
--- a/6
+++ b/6
@ -68,7 +68,7 @@ release-cp: release-dir
 		tuned-gui.py tuned-gui.glade \
 		tuned-gui.desktop $(VERSIONED_NAME)
 	cp -a doc experiments libexec man profiles systemtap tuned contrib icons \
-		$(VERSIONED_NAME)
+		tests $(VERSIONED_NAME)

 archive: clean release-cp
 	tar czf $(VERSIONED_NAME).tar.gz $(VERSIONED_NAME)
@ -223,9 +223,9 @@ clean: clean-html
 	rm -rf $(VERSIONED_NAME) rpm-build-dir

 test:
-	$(PYTHON) -m unittest discover tests
+	$(PYTHON) -m unittest discover tests/unit

 lint:
-	$(PYLINT) -E -f parseable tuned *.py tests
+	$(PYLINT) -E -f parseable tuned *.py tests/unit

 .PHONY: clean archive srpm tag test lint
--- a/tests/beakerlib/.fmf/version
+++ b/tests/beakerlib/.fmf/version
--- a/tests/beakerlib/Program-tuned-tried-to-access-dev-mem-between/main.fmf
+++ b/tests/beakerlib/Program-tuned-tried-to-access-dev-mem-between/main.fmf
--- a/tests/beakerlib/Program-tuned-tried-to-access-dev-mem-between/runtest.sh
+++ b/tests/beakerlib/Program-tuned-tried-to-access-dev-mem-between/runtest.sh
--- a/tests/beakerlib/Tuned-takes-too-long-to-reload-start-when-ulimit/main.fmf
+++ b/tests/beakerlib/Tuned-takes-too-long-to-reload-start-when-ulimit/main.fmf
--- a/tests/beakerlib/Tuned-takes-too-long-to-reload-start-when-ulimit/runtest.sh
+++ b/tests/beakerlib/Tuned-takes-too-long-to-reload-start-when-ulimit/runtest.sh
--- a/tests/beakerlib/bz1416712-Tuned-logs-error-message-if/main.fmf
+++ b/tests/beakerlib/bz1416712-Tuned-logs-error-message-if/main.fmf
--- a/tests/beakerlib/bz1416712-Tuned-logs-error-message-if/runtest.sh
+++ b/tests/beakerlib/bz1416712-Tuned-logs-error-message-if/runtest.sh
--- a/tests/beakerlib/tuned-adm-functionality/main.fmf
+++ b/tests/beakerlib/tuned-adm-functionality/main.fmf
--- a/tests/beakerlib/tuned-adm-functionality/runtest.sh
+++ b/tests/beakerlib/tuned-adm-functionality/runtest.sh
--- a/tests/unit/Dockerfile
+++ b/tests/unit/Dockerfile
--- a/tests/unit/init.py
+++ b/tests/unit/init.py
--- a/tests/unit/exports/init.py
+++ b/tests/unit/exports/init.py
--- a/tests/unit/exports/test_controller.py
+++ b/tests/unit/exports/test_controller.py
--- a/tests/unit/func_basic.sh
+++ b/tests/unit/func_basic.sh
--- a/tests/unit/globals.py
+++ b/tests/unit/globals.py
--- a/tests/unit/hardware/init.py
+++ b/tests/unit/hardware/init.py
--- a/tests/unit/hardware/test_device_matcher.py
+++ b/tests/unit/hardware/test_device_matcher.py
--- a/tests/unit/hardware/test_device_matcher_udev.py
+++ b/tests/unit/hardware/test_device_matcher_udev.py
--- a/tests/unit/hardware/test_inventory.py
+++ b/tests/unit/hardware/test_inventory.py
--- a/tests/unit/monitors/init.py
+++ b/tests/unit/monitors/init.py
--- a/tests/unit/monitors/test_base.py
+++ b/tests/unit/monitors/test_base.py
@ -1,5 +1,5 @@
 import unittest2
-import tests.globals
+import tests.unit.globals
 import tuned.monitors.base

 class MockMonitor(tuned.monitors.base.Monitor):
--- a/tests/unit/plugins/init.py
+++ b/tests/unit/plugins/init.py
--- a/tests/unit/plugins/test_base.py
+++ b/tests/unit/plugins/test_base.py
--- a/tests/unit/profiles/init.py
+++ b/tests/unit/profiles/init.py
--- a/tests/unit/profiles/test_loader.py
+++ b/tests/unit/profiles/test_loader.py
--- a/tests/unit/profiles/test_locator.py
+++ b/tests/unit/profiles/test_locator.py
--- a/tests/unit/profiles/test_merger.py
+++ b/tests/unit/profiles/test_merger.py
--- a/tests/unit/profiles/test_profile.py
+++ b/tests/unit/profiles/test_profile.py
--- a/tests/unit/profiles/test_unit.py
+++ b/tests/unit/profiles/test_unit.py
--- a/tests/unit/storage/init.py
+++ b/tests/unit/storage/init.py
--- a/tests/unit/storage/test_factory.py
+++ b/tests/unit/storage/test_factory.py
--- a/tests/unit/storage/test_pickle_provider.py
+++ b/tests/unit/storage/test_pickle_provider.py
--- a/tests/unit/storage/test_storage.py
+++ b/tests/unit/storage/test_storage.py
--- a/tests/unit/utils/init.py
+++ b/tests/unit/utils/init.py
--- a/tests/unit/utils/test_commands.py
+++ b/tests/unit/utils/test_commands.py
--- a/tests/unit/utils/test_global_config.py
+++ b/tests/unit/utils/test_global_config.py