From a172130abbfa8ad36267fc14f0dc346bcf6a1ae6 Mon Sep 17 00:00:00 2001
From: Peter Schutt <peter.github@proton.me>
Date: Fri, 20 Jan 2023 15:48:45 +1000
Subject: [PATCH] refactor(tests): name directories per extra requirement

---
 mypy.ini                                                      | 4 ++--
 tests/unit/{no_extras => require_no_extras}/conftest.py       | 0
 .../test_init_plugin_for_no_extras.py                         | 0
 tests/unit/{redis => require_redis}/conftest.py               | 0
 .../{redis/worker => require_redis/require_saq}/conftest.py   | 0
 .../require_saq}/test_init_plugin_for_worker.py               | 0
 .../require_saq}/test_log_for_worker.py                       | 0
 .../worker => require_redis/require_saq}/test_worker.py       | 0
 tests/unit/{redis => require_redis}/test_cache.py             | 0
 tests/unit/{sentry => require_sentry}/conftest.py             | 0
 .../{sentry => require_sentry}/test_init_plugin_for_sentry.py | 0
 tests/unit/{sentry => require_sentry}/test_sentry.py          | 0
 tests/unit/{sqlalchemy => require_sqlalchemy}/conftest.py     | 0
 .../{sqlalchemy => require_sqlalchemy}/repository/test_abc.py | 0
 .../repository/test_generic_mock_repository.py                | 0
 .../repository/test_sqlalchemy.py                             | 0
 tests/unit/{sqlalchemy => require_sqlalchemy}/test_db.py      | 0
 tests/unit/{sqlalchemy => require_sqlalchemy}/test_dto.py     | 0
 .../test_health_check_for_sa.py                               | 0
 tests/unit/{sqlalchemy => require_sqlalchemy}/test_orm.py     | 0
 tests/unit/{sqlalchemy => require_sqlalchemy}/test_service.py | 0
 .../test_sqlalchemy_plugin.py                                 | 0
 tests/unit/{sqlalchemy => require_sqlalchemy}/test_testing.py | 0
 23 files changed, 2 insertions(+), 2 deletions(-)
 rename tests/unit/{no_extras => require_no_extras}/conftest.py (100%)
 rename tests/unit/{no_extras => require_no_extras}/test_init_plugin_for_no_extras.py (100%)
 rename tests/unit/{redis => require_redis}/conftest.py (100%)
 rename tests/unit/{redis/worker => require_redis/require_saq}/conftest.py (100%)
 rename tests/unit/{redis/worker => require_redis/require_saq}/test_init_plugin_for_worker.py (100%)
 rename tests/unit/{redis/worker => require_redis/require_saq}/test_log_for_worker.py (100%)
 rename tests/unit/{redis/worker => require_redis/require_saq}/test_worker.py (100%)
 rename tests/unit/{redis => require_redis}/test_cache.py (100%)
 rename tests/unit/{sentry => require_sentry}/conftest.py (100%)
 rename tests/unit/{sentry => require_sentry}/test_init_plugin_for_sentry.py (100%)
 rename tests/unit/{sentry => require_sentry}/test_sentry.py (100%)
 rename tests/unit/{sqlalchemy => require_sqlalchemy}/conftest.py (100%)
 rename tests/unit/{sqlalchemy => require_sqlalchemy}/repository/test_abc.py (100%)
 rename tests/unit/{sqlalchemy => require_sqlalchemy}/repository/test_generic_mock_repository.py (100%)
 rename tests/unit/{sqlalchemy => require_sqlalchemy}/repository/test_sqlalchemy.py (100%)
 rename tests/unit/{sqlalchemy => require_sqlalchemy}/test_db.py (100%)
 rename tests/unit/{sqlalchemy => require_sqlalchemy}/test_dto.py (100%)
 rename tests/unit/{sqlalchemy => require_sqlalchemy}/test_health_check_for_sa.py (100%)
 rename tests/unit/{sqlalchemy => require_sqlalchemy}/test_orm.py (100%)
 rename tests/unit/{sqlalchemy => require_sqlalchemy}/test_service.py (100%)
 rename tests/unit/{sqlalchemy => require_sqlalchemy}/test_sqlalchemy_plugin.py (100%)
 rename tests/unit/{sqlalchemy => require_sqlalchemy}/test_testing.py (100%)

diff --git a/mypy.ini b/mypy.ini
index 4080fb50..36215402 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -18,9 +18,9 @@ warn_unused_ignores = True
 [mypy-tests.*]
 disallow_untyped_decorators = False
 
-[mypy-tests.unit.sqlalchemy.test_dto]
+[mypy-tests.unit.require_sqlalchemy.test_dto]
 # for the declarative base fixture
 disable_error_code = valid-type,misc
 
-[mypy-tests.unit.sqlalchemy.repository.test_sqlalchemy]
+[mypy-tests.unit.require_sqlalchemy.repository.test_sqlalchemy]
 disable_error_code = attr-defined
diff --git a/tests/unit/no_extras/conftest.py b/tests/unit/require_no_extras/conftest.py
similarity index 100%
rename from tests/unit/no_extras/conftest.py
rename to tests/unit/require_no_extras/conftest.py
diff --git a/tests/unit/no_extras/test_init_plugin_for_no_extras.py b/tests/unit/require_no_extras/test_init_plugin_for_no_extras.py
similarity index 100%
rename from tests/unit/no_extras/test_init_plugin_for_no_extras.py
rename to tests/unit/require_no_extras/test_init_plugin_for_no_extras.py
diff --git a/tests/unit/redis/conftest.py b/tests/unit/require_redis/conftest.py
similarity index 100%
rename from tests/unit/redis/conftest.py
rename to tests/unit/require_redis/conftest.py
diff --git a/tests/unit/redis/worker/conftest.py b/tests/unit/require_redis/require_saq/conftest.py
similarity index 100%
rename from tests/unit/redis/worker/conftest.py
rename to tests/unit/require_redis/require_saq/conftest.py
diff --git a/tests/unit/redis/worker/test_init_plugin_for_worker.py b/tests/unit/require_redis/require_saq/test_init_plugin_for_worker.py
similarity index 100%
rename from tests/unit/redis/worker/test_init_plugin_for_worker.py
rename to tests/unit/require_redis/require_saq/test_init_plugin_for_worker.py
diff --git a/tests/unit/redis/worker/test_log_for_worker.py b/tests/unit/require_redis/require_saq/test_log_for_worker.py
similarity index 100%
rename from tests/unit/redis/worker/test_log_for_worker.py
rename to tests/unit/require_redis/require_saq/test_log_for_worker.py
diff --git a/tests/unit/redis/worker/test_worker.py b/tests/unit/require_redis/require_saq/test_worker.py
similarity index 100%
rename from tests/unit/redis/worker/test_worker.py
rename to tests/unit/require_redis/require_saq/test_worker.py
diff --git a/tests/unit/redis/test_cache.py b/tests/unit/require_redis/test_cache.py
similarity index 100%
rename from tests/unit/redis/test_cache.py
rename to tests/unit/require_redis/test_cache.py
diff --git a/tests/unit/sentry/conftest.py b/tests/unit/require_sentry/conftest.py
similarity index 100%
rename from tests/unit/sentry/conftest.py
rename to tests/unit/require_sentry/conftest.py
diff --git a/tests/unit/sentry/test_init_plugin_for_sentry.py b/tests/unit/require_sentry/test_init_plugin_for_sentry.py
similarity index 100%
rename from tests/unit/sentry/test_init_plugin_for_sentry.py
rename to tests/unit/require_sentry/test_init_plugin_for_sentry.py
diff --git a/tests/unit/sentry/test_sentry.py b/tests/unit/require_sentry/test_sentry.py
similarity index 100%
rename from tests/unit/sentry/test_sentry.py
rename to tests/unit/require_sentry/test_sentry.py
diff --git a/tests/unit/sqlalchemy/conftest.py b/tests/unit/require_sqlalchemy/conftest.py
similarity index 100%
rename from tests/unit/sqlalchemy/conftest.py
rename to tests/unit/require_sqlalchemy/conftest.py
diff --git a/tests/unit/sqlalchemy/repository/test_abc.py b/tests/unit/require_sqlalchemy/repository/test_abc.py
similarity index 100%
rename from tests/unit/sqlalchemy/repository/test_abc.py
rename to tests/unit/require_sqlalchemy/repository/test_abc.py
diff --git a/tests/unit/sqlalchemy/repository/test_generic_mock_repository.py b/tests/unit/require_sqlalchemy/repository/test_generic_mock_repository.py
similarity index 100%
rename from tests/unit/sqlalchemy/repository/test_generic_mock_repository.py
rename to tests/unit/require_sqlalchemy/repository/test_generic_mock_repository.py
diff --git a/tests/unit/sqlalchemy/repository/test_sqlalchemy.py b/tests/unit/require_sqlalchemy/repository/test_sqlalchemy.py
similarity index 100%
rename from tests/unit/sqlalchemy/repository/test_sqlalchemy.py
rename to tests/unit/require_sqlalchemy/repository/test_sqlalchemy.py
diff --git a/tests/unit/sqlalchemy/test_db.py b/tests/unit/require_sqlalchemy/test_db.py
similarity index 100%
rename from tests/unit/sqlalchemy/test_db.py
rename to tests/unit/require_sqlalchemy/test_db.py
diff --git a/tests/unit/sqlalchemy/test_dto.py b/tests/unit/require_sqlalchemy/test_dto.py
similarity index 100%
rename from tests/unit/sqlalchemy/test_dto.py
rename to tests/unit/require_sqlalchemy/test_dto.py
diff --git a/tests/unit/sqlalchemy/test_health_check_for_sa.py b/tests/unit/require_sqlalchemy/test_health_check_for_sa.py
similarity index 100%
rename from tests/unit/sqlalchemy/test_health_check_for_sa.py
rename to tests/unit/require_sqlalchemy/test_health_check_for_sa.py
diff --git a/tests/unit/sqlalchemy/test_orm.py b/tests/unit/require_sqlalchemy/test_orm.py
similarity index 100%
rename from tests/unit/sqlalchemy/test_orm.py
rename to tests/unit/require_sqlalchemy/test_orm.py
diff --git a/tests/unit/sqlalchemy/test_service.py b/tests/unit/require_sqlalchemy/test_service.py
similarity index 100%
rename from tests/unit/sqlalchemy/test_service.py
rename to tests/unit/require_sqlalchemy/test_service.py
diff --git a/tests/unit/sqlalchemy/test_sqlalchemy_plugin.py b/tests/unit/require_sqlalchemy/test_sqlalchemy_plugin.py
similarity index 100%
rename from tests/unit/sqlalchemy/test_sqlalchemy_plugin.py
rename to tests/unit/require_sqlalchemy/test_sqlalchemy_plugin.py
diff --git a/tests/unit/sqlalchemy/test_testing.py b/tests/unit/require_sqlalchemy/test_testing.py
similarity index 100%
rename from tests/unit/sqlalchemy/test_testing.py
rename to tests/unit/require_sqlalchemy/test_testing.py