diff --git a/tests/workers/single_process/test_expected_failure.py b/tests/workers/single_process/test_expected_failure.py deleted file mode 100644 index e5201ac0..00000000 --- a/tests/workers/single_process/test_expected_failure.py +++ /dev/null @@ -1,40 +0,0 @@ -""" -Test the Conan command functionality, in a single process, for failure. - -Note that this is not how cruiz tends to work, and should be using multiple processes -to isolate the Conan commands, but this test shows it still works without that -added complexity. -""" - -from __future__ import annotations - -import logging -import typing - -import cruizlib.workers.api as workers_api -from cruizlib.interop.commandparameters import CommandParameters - -# pylint: disable=wrong-import-order -import pytest - -import texceptions - -if typing.TYPE_CHECKING: - from ttypes import MultiprocessReplyQueueFixture, RunWorkerFixture - - -LOGGER = logging.getLogger(__name__) - - -def test_expected_failure( - multiprocess_reply_queue_fixture: MultiprocessReplyQueueFixture, - run_worker: RunWorkerFixture, - conan_local_cache: typing.Dict[str, str], -) -> None: - """Test: running conan install incorrect setup, so has an expected failure.""" - worker = workers_api.install.invoke - params = CommandParameters("install", worker) - params.added_environment = conan_local_cache - reply_queue, _, watcher_thread, context = multiprocess_reply_queue_fixture() - with pytest.raises(texceptions.FailedMessageTestError): - run_worker(worker, reply_queue, params, watcher_thread, context) diff --git a/tests/workers/single_process/test_arbitrary_conan_cmd.py b/tests/workers/test_arbitrary_conan_cmd.py similarity index 100% rename from tests/workers/single_process/test_arbitrary_conan_cmd.py rename to tests/workers/test_arbitrary_conan_cmd.py diff --git a/tests/workers/single_process/test_cmake_build_tool.py b/tests/workers/test_cmake_build_tool.py similarity index 100% rename from tests/workers/single_process/test_cmake_build_tool.py rename to tests/workers/test_cmake_build_tool.py diff --git a/tests/workers/single_process/test_conan_autotools_helper.py b/tests/workers/test_conan_autotools_helper.py similarity index 100% rename from tests/workers/single_process/test_conan_autotools_helper.py rename to tests/workers/test_conan_autotools_helper.py diff --git a/tests/workers/single_process/test_conan_build.py b/tests/workers/test_conan_build.py similarity index 100% rename from tests/workers/single_process/test_conan_build.py rename to tests/workers/test_conan_build.py diff --git a/tests/workers/single_process/test_conan_cmake_helper.py b/tests/workers/test_conan_cmake_helper.py similarity index 100% rename from tests/workers/single_process/test_conan_cmake_helper.py rename to tests/workers/test_conan_cmake_helper.py diff --git a/tests/workers/single_process/test_conan_config_install.py b/tests/workers/test_conan_config_install.py similarity index 100% rename from tests/workers/single_process/test_conan_config_install.py rename to tests/workers/test_conan_config_install.py diff --git a/tests/workers/single_process/test_conan_create.py b/tests/workers/test_conan_create.py similarity index 100% rename from tests/workers/single_process/test_conan_create.py rename to tests/workers/test_conan_create.py diff --git a/tests/workers/single_process/test_conan_exportpkg.py b/tests/workers/test_conan_exportpkg.py similarity index 100% rename from tests/workers/single_process/test_conan_exportpkg.py rename to tests/workers/test_conan_exportpkg.py diff --git a/tests/workers/single_process/test_conan_imports.py b/tests/workers/test_conan_imports.py similarity index 100% rename from tests/workers/single_process/test_conan_imports.py rename to tests/workers/test_conan_imports.py diff --git a/tests/workers/single_process/test_conan_install.py b/tests/workers/test_conan_install.py similarity index 100% rename from tests/workers/single_process/test_conan_install.py rename to tests/workers/test_conan_install.py diff --git a/tests/workers/single_process/test_conan_lockcreate.py b/tests/workers/test_conan_lockcreate.py similarity index 100% rename from tests/workers/single_process/test_conan_lockcreate.py rename to tests/workers/test_conan_lockcreate.py diff --git a/tests/workers/single_process/test_conan_package.py b/tests/workers/test_conan_package.py similarity index 100% rename from tests/workers/single_process/test_conan_package.py rename to tests/workers/test_conan_package.py diff --git a/tests/workers/single_process/test_conan_remote_package_binary.py b/tests/workers/test_conan_remote_package_binary.py similarity index 100% rename from tests/workers/single_process/test_conan_remote_package_binary.py rename to tests/workers/test_conan_remote_package_binary.py diff --git a/tests/workers/single_process/test_conan_remote_package_id.py b/tests/workers/test_conan_remote_package_id.py similarity index 100% rename from tests/workers/single_process/test_conan_remote_package_id.py rename to tests/workers/test_conan_remote_package_id.py diff --git a/tests/workers/single_process/test_conan_remote_package_revisions.py b/tests/workers/test_conan_remote_package_revisions.py similarity index 100% rename from tests/workers/single_process/test_conan_remote_package_revisions.py rename to tests/workers/test_conan_remote_package_revisions.py diff --git a/tests/workers/single_process/test_conan_remote_recipe_revisions.py b/tests/workers/test_conan_remote_recipe_revisions.py similarity index 100% rename from tests/workers/single_process/test_conan_remote_recipe_revisions.py rename to tests/workers/test_conan_remote_recipe_revisions.py diff --git a/tests/workers/single_process/test_conan_remote_search.py b/tests/workers/test_conan_remote_search.py similarity index 100% rename from tests/workers/single_process/test_conan_remote_search.py rename to tests/workers/test_conan_remote_search.py diff --git a/tests/workers/single_process/test_conan_remove_all_packages.py b/tests/workers/test_conan_remove_all_packages.py similarity index 100% rename from tests/workers/single_process/test_conan_remove_all_packages.py rename to tests/workers/test_conan_remove_all_packages.py diff --git a/tests/workers/single_process/test_conan_remove_locks.py b/tests/workers/test_conan_remove_locks.py similarity index 100% rename from tests/workers/single_process/test_conan_remove_locks.py rename to tests/workers/test_conan_remove_locks.py diff --git a/tests/workers/single_process/test_conan_remove_package.py b/tests/workers/test_conan_remove_package.py similarity index 100% rename from tests/workers/single_process/test_conan_remove_package.py rename to tests/workers/test_conan_remove_package.py diff --git a/tests/workers/single_process/test_conan_source.py b/tests/workers/test_conan_source.py similarity index 100% rename from tests/workers/single_process/test_conan_source.py rename to tests/workers/test_conan_source.py diff --git a/tests/workers/single_process/test_conan_test.py b/tests/workers/test_conan_test.py similarity index 100% rename from tests/workers/single_process/test_conan_test.py rename to tests/workers/test_conan_test.py diff --git a/tests/workers/single_process/test_delete_cmake_cache.py b/tests/workers/test_delete_cmake_cache.py similarity index 100% rename from tests/workers/single_process/test_delete_cmake_cache.py rename to tests/workers/test_delete_cmake_cache.py diff --git a/tests/workers/multi_process/test_mp_end_message.py b/tests/workers/test_end_message.py similarity index 100% rename from tests/workers/multi_process/test_mp_end_message.py rename to tests/workers/test_end_message.py diff --git a/tests/workers/multi_process/test_mp_expected_failure.py b/tests/workers/test_expected_failure.py similarity index 100% rename from tests/workers/multi_process/test_mp_expected_failure.py rename to tests/workers/test_expected_failure.py diff --git a/tests/workers/single_process/test_time_commands.py b/tests/workers/test_time_commands.py similarity index 100% rename from tests/workers/single_process/test_time_commands.py rename to tests/workers/test_time_commands.py