From cff78c537c157d9352f822a32b462c89414f40ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 18 Nov 2019 16:34:11 +0100 Subject: [PATCH] tests: moved tests under directory 'tests' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also renamed directories to be more consistent. Signed-off-by: Jaroslav Škarvada --- Makefile | 6 +++--- {tests-beakerlib => tests/beakerlib}/.fmf/version | 0 .../Program-tuned-tried-to-access-dev-mem-between/main.fmf | 0 .../runtest.sh | 0 .../main.fmf | 0 .../runtest.sh | 0 .../bz1416712-Tuned-logs-error-message-if/main.fmf | 0 .../bz1416712-Tuned-logs-error-message-if/runtest.sh | 0 .../beakerlib}/tuned-adm-functionality/main.fmf | 0 .../beakerlib}/tuned-adm-functionality/runtest.sh | 0 tests/{ => unit}/Dockerfile | 0 tests/{ => unit}/__init__.py | 0 tests/{ => unit}/exports/__init__.py | 0 tests/{ => unit}/exports/test_controller.py | 0 tests/{ => unit}/func_basic.sh | 0 tests/{ => unit}/globals.py | 0 tests/{ => unit}/hardware/__init__.py | 0 tests/{ => unit}/hardware/test_device_matcher.py | 0 tests/{ => unit}/hardware/test_device_matcher_udev.py | 0 tests/{ => unit}/hardware/test_inventory.py | 0 tests/{ => unit}/monitors/__init__.py | 0 tests/{ => unit}/monitors/test_base.py | 2 +- tests/{ => unit}/plugins/__init__.py | 0 tests/{ => unit}/plugins/test_base.py | 0 tests/{ => unit}/profiles/__init__.py | 0 tests/{ => unit}/profiles/test_loader.py | 0 tests/{ => unit}/profiles/test_locator.py | 0 tests/{ => unit}/profiles/test_merger.py | 0 tests/{ => unit}/profiles/test_profile.py | 0 tests/{ => unit}/profiles/test_unit.py | 0 tests/{ => unit}/storage/__init__.py | 0 tests/{ => unit}/storage/test_factory.py | 0 tests/{ => unit}/storage/test_pickle_provider.py | 0 tests/{ => unit}/storage/test_storage.py | 0 tests/{ => unit}/utils/__init__.py | 0 tests/{ => unit}/utils/test_commands.py | 0 tests/{ => unit}/utils/test_global_config.py | 0 37 files changed, 4 insertions(+), 4 deletions(-) rename {tests-beakerlib => tests/beakerlib}/.fmf/version (100%) rename {tests-beakerlib => tests/beakerlib}/Program-tuned-tried-to-access-dev-mem-between/main.fmf (100%) rename {tests-beakerlib => tests/beakerlib}/Program-tuned-tried-to-access-dev-mem-between/runtest.sh (100%) rename {tests-beakerlib => tests/beakerlib}/Tuned-takes-too-long-to-reload-start-when-ulimit/main.fmf (100%) rename {tests-beakerlib => tests/beakerlib}/Tuned-takes-too-long-to-reload-start-when-ulimit/runtest.sh (100%) rename {tests-beakerlib => tests/beakerlib}/bz1416712-Tuned-logs-error-message-if/main.fmf (100%) rename {tests-beakerlib => tests/beakerlib}/bz1416712-Tuned-logs-error-message-if/runtest.sh (100%) rename {tests-beakerlib => tests/beakerlib}/tuned-adm-functionality/main.fmf (100%) rename {tests-beakerlib => tests/beakerlib}/tuned-adm-functionality/runtest.sh (100%) rename tests/{ => unit}/Dockerfile (100%) rename tests/{ => unit}/__init__.py (100%) rename tests/{ => unit}/exports/__init__.py (100%) rename tests/{ => unit}/exports/test_controller.py (100%) rename tests/{ => unit}/func_basic.sh (100%) rename tests/{ => unit}/globals.py (100%) rename tests/{ => unit}/hardware/__init__.py (100%) rename tests/{ => unit}/hardware/test_device_matcher.py (100%) rename tests/{ => unit}/hardware/test_device_matcher_udev.py (100%) rename tests/{ => unit}/hardware/test_inventory.py (100%) rename tests/{ => unit}/monitors/__init__.py (100%) rename tests/{ => unit}/monitors/test_base.py (99%) rename tests/{ => unit}/plugins/__init__.py (100%) rename tests/{ => unit}/plugins/test_base.py (100%) rename tests/{ => unit}/profiles/__init__.py (100%) rename tests/{ => unit}/profiles/test_loader.py (100%) rename tests/{ => unit}/profiles/test_locator.py (100%) rename tests/{ => unit}/profiles/test_merger.py (100%) rename tests/{ => unit}/profiles/test_profile.py (100%) rename tests/{ => unit}/profiles/test_unit.py (100%) rename tests/{ => unit}/storage/__init__.py (100%) rename tests/{ => unit}/storage/test_factory.py (100%) rename tests/{ => unit}/storage/test_pickle_provider.py (100%) rename tests/{ => unit}/storage/test_storage.py (100%) rename tests/{ => unit}/utils/__init__.py (100%) rename tests/{ => unit}/utils/test_commands.py (100%) rename tests/{ => unit}/utils/test_global_config.py (100%) diff --git a/Makefile b/Makefile index 64f894b..d36c25c 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/tests-beakerlib/.fmf/version b/tests/beakerlib/.fmf/version similarity index 100% rename from tests-beakerlib/.fmf/version rename to tests/beakerlib/.fmf/version diff --git 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 similarity index 100% rename from tests-beakerlib/Program-tuned-tried-to-access-dev-mem-between/main.fmf rename to tests/beakerlib/Program-tuned-tried-to-access-dev-mem-between/main.fmf diff --git 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 similarity index 100% rename from tests-beakerlib/Program-tuned-tried-to-access-dev-mem-between/runtest.sh rename to tests/beakerlib/Program-tuned-tried-to-access-dev-mem-between/runtest.sh diff --git 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 similarity index 100% rename from tests-beakerlib/Tuned-takes-too-long-to-reload-start-when-ulimit/main.fmf rename to tests/beakerlib/Tuned-takes-too-long-to-reload-start-when-ulimit/main.fmf diff --git 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 similarity index 100% rename from tests-beakerlib/Tuned-takes-too-long-to-reload-start-when-ulimit/runtest.sh rename to tests/beakerlib/Tuned-takes-too-long-to-reload-start-when-ulimit/runtest.sh diff --git a/tests-beakerlib/bz1416712-Tuned-logs-error-message-if/main.fmf b/tests/beakerlib/bz1416712-Tuned-logs-error-message-if/main.fmf similarity index 100% rename from tests-beakerlib/bz1416712-Tuned-logs-error-message-if/main.fmf rename to tests/beakerlib/bz1416712-Tuned-logs-error-message-if/main.fmf diff --git a/tests-beakerlib/bz1416712-Tuned-logs-error-message-if/runtest.sh b/tests/beakerlib/bz1416712-Tuned-logs-error-message-if/runtest.sh similarity index 100% rename from tests-beakerlib/bz1416712-Tuned-logs-error-message-if/runtest.sh rename to tests/beakerlib/bz1416712-Tuned-logs-error-message-if/runtest.sh diff --git a/tests-beakerlib/tuned-adm-functionality/main.fmf b/tests/beakerlib/tuned-adm-functionality/main.fmf similarity index 100% rename from tests-beakerlib/tuned-adm-functionality/main.fmf rename to tests/beakerlib/tuned-adm-functionality/main.fmf diff --git a/tests-beakerlib/tuned-adm-functionality/runtest.sh b/tests/beakerlib/tuned-adm-functionality/runtest.sh similarity index 100% rename from tests-beakerlib/tuned-adm-functionality/runtest.sh rename to tests/beakerlib/tuned-adm-functionality/runtest.sh diff --git a/tests/Dockerfile b/tests/unit/Dockerfile similarity index 100% rename from tests/Dockerfile rename to tests/unit/Dockerfile diff --git a/tests/__init__.py b/tests/unit/__init__.py similarity index 100% rename from tests/__init__.py rename to tests/unit/__init__.py diff --git a/tests/exports/__init__.py b/tests/unit/exports/__init__.py similarity index 100% rename from tests/exports/__init__.py rename to tests/unit/exports/__init__.py diff --git a/tests/exports/test_controller.py b/tests/unit/exports/test_controller.py similarity index 100% rename from tests/exports/test_controller.py rename to tests/unit/exports/test_controller.py diff --git a/tests/func_basic.sh b/tests/unit/func_basic.sh similarity index 100% rename from tests/func_basic.sh rename to tests/unit/func_basic.sh diff --git a/tests/globals.py b/tests/unit/globals.py similarity index 100% rename from tests/globals.py rename to tests/unit/globals.py diff --git a/tests/hardware/__init__.py b/tests/unit/hardware/__init__.py similarity index 100% rename from tests/hardware/__init__.py rename to tests/unit/hardware/__init__.py diff --git a/tests/hardware/test_device_matcher.py b/tests/unit/hardware/test_device_matcher.py similarity index 100% rename from tests/hardware/test_device_matcher.py rename to tests/unit/hardware/test_device_matcher.py diff --git a/tests/hardware/test_device_matcher_udev.py b/tests/unit/hardware/test_device_matcher_udev.py similarity index 100% rename from tests/hardware/test_device_matcher_udev.py rename to tests/unit/hardware/test_device_matcher_udev.py diff --git a/tests/hardware/test_inventory.py b/tests/unit/hardware/test_inventory.py similarity index 100% rename from tests/hardware/test_inventory.py rename to tests/unit/hardware/test_inventory.py diff --git a/tests/monitors/__init__.py b/tests/unit/monitors/__init__.py similarity index 100% rename from tests/monitors/__init__.py rename to tests/unit/monitors/__init__.py diff --git a/tests/monitors/test_base.py b/tests/unit/monitors/test_base.py similarity index 99% rename from tests/monitors/test_base.py rename to tests/unit/monitors/test_base.py index 64fd59e..7ee9bcf 100644 --- a/tests/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): diff --git a/tests/plugins/__init__.py b/tests/unit/plugins/__init__.py similarity index 100% rename from tests/plugins/__init__.py rename to tests/unit/plugins/__init__.py diff --git a/tests/plugins/test_base.py b/tests/unit/plugins/test_base.py similarity index 100% rename from tests/plugins/test_base.py rename to tests/unit/plugins/test_base.py diff --git a/tests/profiles/__init__.py b/tests/unit/profiles/__init__.py similarity index 100% rename from tests/profiles/__init__.py rename to tests/unit/profiles/__init__.py diff --git a/tests/profiles/test_loader.py b/tests/unit/profiles/test_loader.py similarity index 100% rename from tests/profiles/test_loader.py rename to tests/unit/profiles/test_loader.py diff --git a/tests/profiles/test_locator.py b/tests/unit/profiles/test_locator.py similarity index 100% rename from tests/profiles/test_locator.py rename to tests/unit/profiles/test_locator.py diff --git a/tests/profiles/test_merger.py b/tests/unit/profiles/test_merger.py similarity index 100% rename from tests/profiles/test_merger.py rename to tests/unit/profiles/test_merger.py diff --git a/tests/profiles/test_profile.py b/tests/unit/profiles/test_profile.py similarity index 100% rename from tests/profiles/test_profile.py rename to tests/unit/profiles/test_profile.py diff --git a/tests/profiles/test_unit.py b/tests/unit/profiles/test_unit.py similarity index 100% rename from tests/profiles/test_unit.py rename to tests/unit/profiles/test_unit.py diff --git a/tests/storage/__init__.py b/tests/unit/storage/__init__.py similarity index 100% rename from tests/storage/__init__.py rename to tests/unit/storage/__init__.py diff --git a/tests/storage/test_factory.py b/tests/unit/storage/test_factory.py similarity index 100% rename from tests/storage/test_factory.py rename to tests/unit/storage/test_factory.py diff --git a/tests/storage/test_pickle_provider.py b/tests/unit/storage/test_pickle_provider.py similarity index 100% rename from tests/storage/test_pickle_provider.py rename to tests/unit/storage/test_pickle_provider.py diff --git a/tests/storage/test_storage.py b/tests/unit/storage/test_storage.py similarity index 100% rename from tests/storage/test_storage.py rename to tests/unit/storage/test_storage.py diff --git a/tests/utils/__init__.py b/tests/unit/utils/__init__.py similarity index 100% rename from tests/utils/__init__.py rename to tests/unit/utils/__init__.py diff --git a/tests/utils/test_commands.py b/tests/unit/utils/test_commands.py similarity index 100% rename from tests/utils/test_commands.py rename to tests/unit/utils/test_commands.py diff --git a/tests/utils/test_global_config.py b/tests/unit/utils/test_global_config.py similarity index 100% rename from tests/utils/test_global_config.py rename to tests/unit/utils/test_global_config.py