Synchronise tox configuration between amazon.aws and community.aws (#…

…2486) SUMMARY tox configs needed a little cleanup to ensure that things were consistently in the import path when running pylint. ISSUE TYPE Feature Pull Request COMPONENT NAME pyproject.toml tests/unit/conftest.py tox.ini ADDITIONAL INFORMATION See also: ansible-collections/community.aws#2219 Reviewed-by: Alina Buzachis
ansible-collections · Jan 28, 2025 · 62ea880 · 62ea880
1 parent 528843e
commit 62ea880
Show file tree

Hide file tree

Showing 88 changed files with 94 additions and 72 deletions.
diff --git a/.coveragerc b/.coveragerc
diff --git a/check_mypy.sh b/check_mypy.sh
diff --git a/pyproject.toml b/pyproject.toml
@@ -54,7 +54,18 @@ disable_error_code = ["import-untyped"]
 line-length = 120
 
 [tool.ruff.lint]
-# "F401" - unused-imports - We use these imports to maintaining historic Interfaces
+# "F401" - unused-imports - We use these imports to maintain historic Interfaces
 # "E402" - import not at top of file - General Ansible style puts the documentation at the top.
 unfixable = ["F401"]
 ignore = ["F401", "E402"]
+
+[tool.pytest]
+xfail_strict = true
+
+[tool.coverage.report]
+exclude_lines = [
+    # Have to re-enable the standard pragma
+    "pragma: no cover",
+    # Don't complain if tests don't hit defensive assertion code:
+    "raise NotImplementedError",
+]
diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
@@ -1,9 +1,9 @@
+# -*- coding: utf-8 -*-
+
 # This file is part of Ansible
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
-# pylint: disable=unused-import
-
-import pytest
-
-from .utils.amazon_placebo_fixtures import fixture_maybe_sleep
-from .utils.amazon_placebo_fixtures import fixture_placeboify
+# While it may seem appropriate to import our custom fixtures here, the pytest_ansible pytest plugin
+# isn't as agressive as the ansible_test._util.target.pytest.plugins.ansible_pytest_collections plugin
+# when it comes to rewriting the import paths and as such we can't import fixtures via their
+# absolute import path or across collections.
diff --git a/tests/unit/plugins/conftest.py b/tests/unit/plugins/conftest.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+
+# This file is part of Ansible
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+# pylint: disable=unused-import
+
+import pytest
+
+from ansible_collections.amazon.aws.tests.unit.utils.amazon_placebo_fixtures import fixture_maybe_sleep
+from ansible_collections.amazon.aws.tests.unit.utils.amazon_placebo_fixtures import fixture_placeboify
diff --git a/tests/unit/module_utils/__init__.py → tests/unit/plugins/module_utils/__init__.py b/tests/unit/module_utils/__init__.py → tests/unit/plugins/module_utils/__init__.py
diff --git a/tests/unit/module_utils/arn/__init__.py → ...unit/plugins/module_utils/arn/__init__.py b/tests/unit/module_utils/arn/__init__.py → ...unit/plugins/module_utils/arn/__init__.py
diff --git a/...t/module_utils/arn/test_is_outpost_arn.py → ...s/module_utils/arn/test_is_outpost_arn.py b/...t/module_utils/arn/test_is_outpost_arn.py → ...s/module_utils/arn/test_is_outpost_arn.py
diff --git a/...it/module_utils/arn/test_parse_aws_arn.py → ...ns/module_utils/arn/test_parse_aws_arn.py b/...it/module_utils/arn/test_parse_aws_arn.py → ...ns/module_utils/arn/test_parse_aws_arn.py
diff --git a/...module_utils/arn/test_validate_aws_arn.py → ...module_utils/arn/test_validate_aws_arn.py b/...module_utils/arn/test_validate_aws_arn.py → ...module_utils/arn/test_validate_aws_arn.py
diff --git a/...scaling/test_autoscaling_error_handler.py → ...scaling/test_autoscaling_error_handler.py b/...scaling/test_autoscaling_error_handler.py → ...scaling/test_autoscaling_error_handler.py
diff --git a/...g/test_autoscaling_resource_transforms.py → ...g/test_autoscaling_resource_transforms.py b/...g/test_autoscaling_resource_transforms.py → ...g/test_autoscaling_resource_transforms.py
diff --git a/tests/unit/module_utils/botocore/__init__.py → ...plugins/module_utils/botocore/__init__.py b/tests/unit/module_utils/botocore/__init__.py → ...plugins/module_utils/botocore/__init__.py
diff --git a/.../module_utils/botocore/test_aws_region.py → .../module_utils/botocore/test_aws_region.py b/.../module_utils/botocore/test_aws_region.py → .../module_utils/botocore/test_aws_region.py
diff --git a/.../module_utils/botocore/test_boto3_conn.py → .../module_utils/botocore/test_boto3_conn.py b/.../module_utils/botocore/test_boto3_conn.py → .../module_utils/botocore/test_boto3_conn.py
diff --git a/...le_utils/botocore/test_connection_info.py → ...le_utils/botocore/test_connection_info.py b/...le_utils/botocore/test_connection_info.py → ...le_utils/botocore/test_connection_info.py
diff --git a/...tils/botocore/test_is_boto3_error_code.py → ...tils/botocore/test_is_boto3_error_code.py b/...tils/botocore/test_is_boto3_error_code.py → ...tils/botocore/test_is_boto3_error_code.py
diff --git a/...s/botocore/test_is_boto3_error_message.py → ...s/botocore/test_is_boto3_error_message.py b/...s/botocore/test_is_boto3_error_message.py → ...s/botocore/test_is_boto3_error_message.py
diff --git a/...ls/botocore/test_merge_botocore_config.py → ...ls/botocore/test_merge_botocore_config.py b/...ls/botocore/test_merge_botocore_config.py → ...ls/botocore/test_merge_botocore_config.py
diff --git a/...s/botocore/test_normalize_boto3_result.py → ...s/botocore/test_normalize_boto3_result.py b/...s/botocore/test_normalize_boto3_result.py → ...s/botocore/test_normalize_boto3_result.py
diff --git a/...odule_utils/botocore/test_sdk_versions.py → ...odule_utils/botocore/test_sdk_versions.py b/...odule_utils/botocore/test_sdk_versions.py → ...odule_utils/botocore/test_sdk_versions.py
diff --git a/tests/unit/module_utils/cloud/__init__.py → ...it/plugins/module_utils/cloud/__init__.py b/tests/unit/module_utils/cloud/__init__.py → ...it/plugins/module_utils/cloud/__init__.py
diff --git a/...dule_utils/cloud/test_backoff_iterator.py → ...dule_utils/cloud/test_backoff_iterator.py b/...dule_utils/cloud/test_backoff_iterator.py → ...dule_utils/cloud/test_backoff_iterator.py
diff --git a/...it/module_utils/cloud/test_cloud_retry.py → ...ns/module_utils/cloud/test_cloud_retry.py b/...it/module_utils/cloud/test_cloud_retry.py → ...ns/module_utils/cloud/test_cloud_retry.py
diff --git a/..._utils/cloud/test_decorator_generation.py → ..._utils/cloud/test_decorator_generation.py b/..._utils/cloud/test_decorator_generation.py → ..._utils/cloud/test_decorator_generation.py
diff --git a/.../module_utils/cloud/test_retries_found.py → .../module_utils/cloud/test_retries_found.py b/.../module_utils/cloud/test_retries_found.py → .../module_utils/cloud/test_retries_found.py
diff --git a/...nit/module_utils/cloud/test_retry_func.py → ...ins/module_utils/cloud/test_retry_func.py b/...nit/module_utils/cloud/test_retry_func.py → ...ins/module_utils/cloud/test_retry_func.py
diff --git a/tests/unit/module_utils/conftest.py → tests/unit/plugins/module_utils/conftest.py b/tests/unit/module_utils/conftest.py → tests/unit/plugins/module_utils/conftest.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 # Copyright (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 

diff --git a/...dule_utils/ec2/test_determine_iam_role.py → ...dule_utils/ec2/test_determine_iam_role.py b/...dule_utils/ec2/test_determine_iam_role.py → ...dule_utils/ec2/test_determine_iam_role.py
diff --git a/tests/unit/module_utils/elbv2/__init__.py → ...it/plugins/module_utils/elbv2/__init__.py b/tests/unit/module_utils/elbv2/__init__.py → ...it/plugins/module_utils/elbv2/__init__.py
diff --git a/tests/unit/module_utils/elbv2/test_elbv2.py → .../plugins/module_utils/elbv2/test_elbv2.py b/tests/unit/module_utils/elbv2/test_elbv2.py → .../plugins/module_utils/elbv2/test_elbv2.py
diff --git a/...module_utils/elbv2/test_listener_rules.py → ...module_utils/elbv2/test_listener_rules.py b/...module_utils/elbv2/test_listener_rules.py → ...module_utils/elbv2/test_listener_rules.py
diff --git a/tests/unit/module_utils/elbv2/test_prune.py → .../plugins/module_utils/elbv2/test_prune.py b/tests/unit/module_utils/elbv2/test_prune.py → .../plugins/module_utils/elbv2/test_prune.py
diff --git a/.../aws_error_handler/test_common_handler.py → .../aws_error_handler/test_common_handler.py b/.../aws_error_handler/test_common_handler.py → .../aws_error_handler/test_common_handler.py
diff --git a/...ws_error_handler/test_deletion_handler.py → ...ws_error_handler/test_deletion_handler.py b/...ws_error_handler/test_deletion_handler.py → ...ws_error_handler/test_deletion_handler.py
diff --git a/...rs/aws_error_handler/test_list_handler.py → ...rs/aws_error_handler/test_list_handler.py b/...rs/aws_error_handler/test_list_handler.py → ...rs/aws_error_handler/test_list_handler.py
diff --git a/.../unit/module_utils/exceptions/__init__.py → ...ugins/module_utils/exceptions/__init__.py b/.../unit/module_utils/exceptions/__init__.py → ...ugins/module_utils/exceptions/__init__.py
diff --git a/...odule_utils/exceptions/test_exceptions.py → ...odule_utils/exceptions/test_exceptions.py b/...odule_utils/exceptions/test_exceptions.py → ...odule_utils/exceptions/test_exceptions.py
diff --git a/...odule_utils/iam/test_iam_error_handler.py → ...odule_utils/iam/test_iam_error_handler.py b/...odule_utils/iam/test_iam_error_handler.py → ...odule_utils/iam/test_iam_error_handler.py
diff --git a/...utils/iam/test_iam_resource_transforms.py → ...utils/iam/test_iam_resource_transforms.py b/...utils/iam/test_iam_resource_transforms.py → ...utils/iam/test_iam_resource_transforms.py
diff --git a/...tils/iam/test_validate_iam_identifiers.py → ...tils/iam/test_validate_iam_identifiers.py b/...tils/iam/test_validate_iam_identifiers.py → ...tils/iam/test_validate_iam_identifiers.py
diff --git a/tests/unit/module_utils/modules/__init__.py → .../plugins/module_utils/modules/__init__.py b/tests/unit/module_utils/modules/__init__.py → .../plugins/module_utils/modules/__init__.py
diff --git a/...ls/modules/ansible_aws_module/__init__.py → ...ls/modules/ansible_aws_module/__init__.py b/...ls/modules/ansible_aws_module/__init__.py → ...ls/modules/ansible_aws_module/__init__.py
diff --git a/.../ansible_aws_module/test_fail_json_aws.py → .../ansible_aws_module/test_fail_json_aws.py b/.../ansible_aws_module/test_fail_json_aws.py → .../ansible_aws_module/test_fail_json_aws.py
diff --git a/...sible_aws_module/test_minimal_versions.py → ...sible_aws_module/test_minimal_versions.py b/...sible_aws_module/test_minimal_versions.py → ...sible_aws_module/test_minimal_versions.py
diff --git a/...es/ansible_aws_module/test_passthrough.py → ...es/ansible_aws_module/test_passthrough.py b/...es/ansible_aws_module/test_passthrough.py → ...es/ansible_aws_module/test_passthrough.py
diff --git a/...sible_aws_module/test_require_at_least.py → ...sible_aws_module/test_require_at_least.py b/...sible_aws_module/test_require_at_least.py → ...sible_aws_module/test_require_at_least.py
diff --git a/tests/unit/module_utils/policy/__init__.py → ...t/plugins/module_utils/policy/__init__.py b/tests/unit/module_utils/policy/__init__.py → ...t/plugins/module_utils/policy/__init__.py
diff --git a/.../module_utils/policy/test_canonicalize.py → .../module_utils/policy/test_canonicalize.py b/.../module_utils/policy/test_canonicalize.py → .../module_utils/policy/test_canonicalize.py
diff --git a/...ule_utils/policy/test_compare_policies.py → ...ule_utils/policy/test_compare_policies.py b/...ule_utils/policy/test_compare_policies.py → ...ule_utils/policy/test_compare_policies.py
diff --git a/...s/unit/module_utils/policy/test_py3cmp.py → ...lugins/module_utils/policy/test_py3cmp.py b/...s/unit/module_utils/policy/test_py3cmp.py → ...lugins/module_utils/policy/test_py3cmp.py
diff --git a/...ils/policy/test_simple_hashable_policy.py → ...ils/policy/test_simple_hashable_policy.py b/...ils/policy/test_simple_hashable_policy.py → ...ils/policy/test_simple_hashable_policy.py
diff --git a/tests/unit/module_utils/retries/__init__.py → .../plugins/module_utils/retries/__init__.py b/tests/unit/module_utils/retries/__init__.py → .../plugins/module_utils/retries/__init__.py
diff --git a/...nit/module_utils/retries/test_awsretry.py → ...ins/module_utils/retries/test_awsretry.py b/...nit/module_utils/retries/test_awsretry.py → ...ins/module_utils/retries/test_awsretry.py
diff --git a/.../retries/test_botocore_exception_maybe.py → .../retries/test_botocore_exception_maybe.py b/.../retries/test_botocore_exception_maybe.py → .../retries/test_botocore_exception_maybe.py
diff --git a/...odule_utils/retries/test_retry_wrapper.py → ...odule_utils/retries/test_retry_wrapper.py b/...odule_utils/retries/test_retry_wrapper.py → ...odule_utils/retries/test_retry_wrapper.py
diff --git a/tests/unit/module_utils/s3/test_endpoints.py → ...plugins/module_utils/s3/test_endpoints.py b/tests/unit/module_utils/s3/test_endpoints.py → ...plugins/module_utils/s3/test_endpoints.py
diff --git a/tests/unit/module_utils/s3/test_etags.py → ...nit/plugins/module_utils/s3/test_etags.py b/tests/unit/module_utils/s3/test_etags.py → ...nit/plugins/module_utils/s3/test_etags.py
diff --git a/.../module_utils/s3/test_s3_error_handler.py → .../module_utils/s3/test_s3_error_handler.py b/.../module_utils/s3/test_s3_error_handler.py → .../module_utils/s3/test_s3_error_handler.py
diff --git a/...ule_utils/s3/test_validate_bucket_name.py → ...ule_utils/s3/test_validate_bucket_name.py b/...ule_utils/s3/test_validate_bucket_name.py → ...ule_utils/s3/test_validate_bucket_name.py
diff --git a/tests/unit/module_utils/test_acm.py → tests/unit/plugins/module_utils/test_acm.py b/tests/unit/module_utils/test_acm.py → tests/unit/plugins/module_utils/test_acm.py
diff --git a/...nit/module_utils/test_cloudfront_facts.py → ...ins/module_utils/test_cloudfront_facts.py b/...nit/module_utils/test_cloudfront_facts.py → ...ins/module_utils/test_cloudfront_facts.py
diff --git a/...t/module_utils/test_get_aws_account_id.py → ...s/module_utils/test_get_aws_account_id.py b/...t/module_utils/test_get_aws_account_id.py → ...s/module_utils/test_get_aws_account_id.py
diff --git a/tests/unit/module_utils/test_rds.py → tests/unit/plugins/module_utils/test_rds.py b/tests/unit/module_utils/test_rds.py → tests/unit/plugins/module_utils/test_rds.py
diff --git a/tests/unit/module_utils/test_tagging.py → ...unit/plugins/module_utils/test_tagging.py b/tests/unit/module_utils/test_tagging.py → ...unit/plugins/module_utils/test_tagging.py
diff --git a/tests/unit/module_utils/test_tower.py → ...s/unit/plugins/module_utils/test_tower.py b/tests/unit/module_utils/test_tower.py → ...s/unit/plugins/module_utils/test_tower.py
diff --git a/...t/module_utils/transformation/__init__.py → ...s/module_utils/transformation/__init__.py b/...t/module_utils/transformation/__init__.py → ...s/module_utils/transformation/__init__.py
diff --git a/...test_ansible_dict_to_boto3_filter_list.py → ...test_ansible_dict_to_boto3_filter_list.py b/...test_ansible_dict_to_boto3_filter_list.py → ...test_ansible_dict_to_boto3_filter_list.py
diff --git a/...on/test_boto3_resource_to_ansible_dict.py → ...on/test_boto3_resource_to_ansible_dict.py b/...on/test_boto3_resource_to_ansible_dict.py → ...on/test_boto3_resource_to_ansible_dict.py
diff --git a/...s/transformation/test_map_complex_type.py → ...s/transformation/test_map_complex_type.py b/...s/transformation/test_map_complex_type.py → ...s/transformation/test_map_complex_type.py
diff --git a/..._sanitize_filters_to_boto3_filter_list.py → ..._sanitize_filters_to_boto3_filter_list.py b/..._sanitize_filters_to_boto3_filter_list.py → ..._sanitize_filters_to_boto3_filter_list.py
diff --git a/...nsformation/test_scrub_none_parameters.py → ...nsformation/test_scrub_none_parameters.py b/...nsformation/test_scrub_none_parameters.py → ...nsformation/test_scrub_none_parameters.py
diff --git a/...utils/waiter/test_custom_waiter_config.py → ...utils/waiter/test_custom_waiter_config.py b/...utils/waiter/test_custom_waiter_config.py → ...utils/waiter/test_custom_waiter_config.py
diff --git a/tests/unit/plugins/modules/conftest.py b/tests/unit/plugins/modules/conftest.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 # Copyright (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 

diff --git a/tests/unit/plugin_utils/__init__.py → tests/unit/plugins/plugin_utils/__init__.py b/tests/unit/plugin_utils/__init__.py → tests/unit/plugins/plugin_utils/__init__.py
diff --git a/tests/unit/plugin_utils/base/__init__.py → ...nit/plugins/plugin_utils/base/__init__.py b/tests/unit/plugin_utils/base/__init__.py → ...nit/plugins/plugin_utils/base/__init__.py
diff --git a/tests/unit/plugin_utils/base/test_plugin.py → .../plugins/plugin_utils/base/test_plugin.py b/tests/unit/plugin_utils/base/test_plugin.py → .../plugins/plugin_utils/base/test_plugin.py
diff --git a/tests/unit/plugin_utils/botocore/__init__.py → ...plugins/plugin_utils/botocore/__init__.py b/tests/unit/plugin_utils/botocore/__init__.py → ...plugins/plugin_utils/botocore/__init__.py
diff --git a/..._utils/botocore/test_boto3_conn_plugin.py → ..._utils/botocore/test_boto3_conn_plugin.py b/..._utils/botocore/test_boto3_conn_plugin.py → ..._utils/botocore/test_boto3_conn_plugin.py
diff --git a/...gin_utils/botocore/test_get_aws_region.py → ...gin_utils/botocore/test_get_aws_region.py b/...gin_utils/botocore/test_get_aws_region.py → ...gin_utils/botocore/test_get_aws_region.py
diff --git a/...tils/botocore/test_get_connection_info.py → ...tils/botocore/test_get_connection_info.py b/...tils/botocore/test_get_connection_info.py → ...tils/botocore/test_get_connection_info.py
diff --git a/.../unit/plugin_utils/connection/__init__.py → ...ugins/plugin_utils/connection/__init__.py b/.../unit/plugin_utils/connection/__init__.py → ...ugins/plugin_utils/connection/__init__.py
diff --git a/..._utils/connection/test_connection_base.py → ..._utils/connection/test_connection_base.py b/..._utils/connection/test_connection_base.py → ..._utils/connection/test_connection_base.py
diff --git a/...in_utils/inventory/test_inventory_base.py → ...in_utils/inventory/test_inventory_base.py b/...in_utils/inventory/test_inventory_base.py → ...in_utils/inventory/test_inventory_base.py
diff --git a/...utils/inventory/test_inventory_clients.py → ...utils/inventory/test_inventory_clients.py b/...utils/inventory/test_inventory_clients.py → ...utils/inventory/test_inventory_clients.py
diff --git a/tests/unit/plugin_utils/lookup/__init__.py → ...t/plugins/plugin_utils/lookup/__init__.py b/tests/unit/plugin_utils/lookup/__init__.py → ...t/plugins/plugin_utils/lookup/__init__.py
diff --git a/...t/plugin_utils/lookup/test_lookup_base.py → ...s/plugin_utils/lookup/test_lookup_base.py b/...t/plugin_utils/lookup/test_lookup_base.py → ...s/plugin_utils/lookup/test_lookup_base.py
diff --git a/tox.ini b/tox.ini
@@ -7,43 +7,55 @@ envlist =
     ansible{2.15}-py{39,310,311}-{with_constraints,without_constraints}
     ansible{2.16,2.17}-py{310,311,312}-{with_constraints,without_constraints}
     ansible{2.18}-py{311,312,313}-{with_constraints,without_constraints}
-    linters
 
 [common]
+collection_name = amazon.aws
+collection_path = amazon/aws
+
 format_dirs = {toxinidir}/plugins {toxinidir}/tests
 lint_dirs = {toxinidir}/plugins {toxinidir}/tests
+
 ansible_desc =
     ansible2.15: Ansible-core 2.15
     ansible2.16: Ansible-core 2.16
     ansible2.17: Ansible-core 2.17
     ansible2.18: Ansible-core 2.18
 const_desc =
     with_constraints: (With boto3/botocore constraints)
-collection_path = collections/ansible_collections/amazon/aws
-collection_name = amazon.aws
-[mypy]
-mypy_path = {envtmpdir}/mypy
-full_tmp_path = {[mypy]mypy_path}/{[common]collection_path}
-[ansible-sanity]
-sanity_tmp_path = {envtmpdir}/ansible-sanity
-full_tmp_path = {[ansible-sanity]sanity_tmp_path}/{[common]collection_path}
-[future-lint]
-lint_tmp_path = {envtmpdir}/ansible-lint
-full_tmp_path = {[future-lint]lint_tmp_path}/{[common]collection_path}
+
+ansible_home = {envtmpdir}/ansible_home
+ansible_collections_path = {[common]ansible_home}/collections
+full_collection_path = {[common]ansible_home}/collections/ansible_collections/{[common]collection_path}
 
 [testenv]
 description = Run the unit tests {[common]ansible_desc}/{base_python} {[common]const_desc}
+set_env =
+  ANSIBLE_HOME={[common]ansible_home}
+  ANSIBLE_COLLECTIONS_PATH={[common]ansible_collections_path}
+# ansible_pytest_collections is more aggressive than pytest_ansible when injecting collections into the import path
+# not needed if unit tests are under tests/unit/plugins rather than directly under tests/unit
+#  ANSIBLE_CONTROLLER_MIN_PYTHON_VERSION=3.11
+#  PYTEST_PLUGINS=ansible_test._util.target.pytest.plugins.ansible_pytest_collections
 labels = unit
 deps =
   pytest
+  mock
+  pytest-mock
   pytest-cov
   pytest-ansible
+  pytest-xdist
   -rtest-requirements.txt
+  -rtests/unit/requirements.txt
   ansible2.15: ansible-core>2.15,<2.16
   ansible2.16: ansible-core>2.16,<2.17
   ansible2.17: ansible-core>2.17,<2.18
   ansible2.18: ansible-core>2.18,<2.19
   with_constraints: -rtests/unit/constraints.txt
+allowlist_externals = rsync
+change_dir = {[common]full_collection_path}
+commands_pre =
+  rsync --delete --exclude=.tox -qraugpo {toxinidir}/ {[common]full_collection_path}/
+  ansible-galaxy collection install git+https://github.com/ansible-collections/community.aws.git
 commands =
     pytest \
         --cov-report html \
@@ -62,16 +74,20 @@ description = Remove test results and caches
 allowlist_externals = rm
 deps = coverage
 skip_install = true
+change_dir = {toxinidir}
+commands_pre =
 commands =
     coverage erase
-    rm -rf tests/output/ htmlcov/ .mypy_cache/ complexity/
+    rm -rf tests/output/ htmlcov/ .mypy_cache/ complexity/ .ruff_cache/
 
 [testenv:complexity-report]
 labels = future-lint
 description = Generate a HTML complexity report in the complexity directory
 deps =
   flake8-pyproject
   flake8-html
+change_dir = {toxinidir}
+commands_pre =
 commands =
     -flake8 \
         --select C90 \
@@ -86,6 +102,8 @@ description = Run ansible-lint
 deps =
   ansible-lint >= 24.7.0
   jmespath
+change_dir = {toxinidir}
+commands_pre =
 commands =
   ansible-lint \
         --skip-list=name[missing],yaml[line-length],args[module],run-once[task],ignore-errors,sanity[cannot-ignore],run-once[play] \
@@ -98,6 +116,8 @@ depends =
   flynt, isort
 deps =
   black >=23.0, <24.0
+change_dir = {toxinidir}
+commands_pre =
 commands =
   black {posargs:{[common]format_dirs}}
 
@@ -106,14 +126,18 @@ labels = lint
 description = Lint against "black" formatting standards
 deps =
   {[testenv:black]deps}
+change_dir = {toxinidir}
+commands_pre =
 commands =
-  black -v --check --diff {posargs:{[common]format_dirs}}
+  black --check --diff {posargs:{[common]format_dirs}}
 
 [testenv:isort]
 labels = format
 description = Sort imports
 deps =
   isort
+change_dir = {toxinidir}
+commands_pre =
 commands =
   isort {posargs:{[common]format_dirs}}
 
@@ -122,6 +146,8 @@ labels = lint
 description = Lint for import sorting
 deps =
   {[testenv:isort]deps}
+change_dir = {toxinidir}
+commands_pre =
 commands =
   isort --check-only --diff {posargs:{[common]format_dirs}}
 
@@ -130,6 +156,8 @@ labels = format
 description = Apply flint (f-string) formatting
 deps =
   flynt
+change_dir = {toxinidir}
+commands_pre =
 commands =
   flynt {posargs:{[common]format_dirs}}
 
@@ -138,6 +166,8 @@ labels = lint
 description = Run flint (f-string) linting
 deps =
   flynt
+change_dir = {toxinidir}
+commands_pre =
 commands =
   flynt --dry-run --fail-on-change {posargs:{[common]format_dirs}}
 
@@ -147,6 +177,8 @@ description = Run FLAKE8 linting
 deps =
   flake8
   flake8-pyproject
+change_dir = {toxinidir}
+commands_pre =
 commands =
   flake8 {posargs:{[common]format_dirs}}
 
@@ -155,6 +187,8 @@ labels = lint
 description = Run pylint tests that are disabled by the default Ansible sanity tests
 deps =
   pylint
+change_dir = {toxinidir}
+commands_pre =
 commands =
   pylint \
     --disable R,C,W,E \
@@ -175,6 +209,8 @@ description = lint source code
 labels = format-future
 deps =
     ruff
+change_dir = {toxinidir}
+commands_pre =
 commands =
     ruff check --fix {posargs:{[common]lint_dirs}}
     ruff format {posargs:{[common]lint_dirs}}
@@ -184,59 +220,41 @@ description = lint source code
 labels = lint-future
 deps =
     ruff
+change_dir = {toxinidir}
+commands_pre =
 commands =
     ruff check --diff --unsafe-fixes {posargs:{[common]lint_dirs}}
     ruff check {posargs:{[common]lint_dirs}}
 
 [testenv:ansible-lint-future]
-allowlist_externals = echo,cd,rm,mkdir,ln,ls
 labels = future-lint
 description = Run ansible-lint
-# ansible-lint expects us to be installed into ansible_collections/amazon/aws
-# by default we're checked out into amazon.aws
-set_env =
-  ANSIBLE_HOME={[future-lint]lint_tmp_path}
-commands_pre =
-  rm -rf {[future-lint]lint_tmp_path}
-  mkdir -p {[future-lint]full_tmp_path}
-  rm -d {[future-lint]full_tmp_path}
-  ln -s {toxinidir} {[future-lint]full_tmp_path}
-  ansible-galaxy collection install git+https://github.com/ansible-collections/community.aws.git
-  ansible-galaxy collection install -r tests/integration/requirements.yml
 deps =
   ansible-lint
   jmespath
   git+https://github.com/ansible/ansible.git@devel
   shellcheck-py
 commands =
-  cd {[future-lint]full_tmp_path}
   ansible-lint \
-        {posargs:plugins/ tests/}
+        {posargs:{[common]lint_dirs}}
 
 [testenv:ansible-sanity]
-allowlist_externals = echo,cd,rm,mkdir,ln,ls
 labels = future-lint
 description = Run latest (devel) Ansible sanity tests
-# ansible-sanity expects us to be installed into ansible_collections/amazon/aws
-# by default we're checked out into amazon.aws
-commands_pre =
-  rm -rf {[ansible-sanity]sanity_tmp_path}
-  mkdir -p {[ansible-sanity]full_tmp_path}
-  rm -d {[ansible-sanity]full_tmp_path}
-  ln -s {toxinidir} {[ansible-sanity]full_tmp_path}
 deps =
   git+https://github.com/ansible/ansible.git@devel
   shellcheck-py
 commands =
-  cd {[ansible-sanity]full_tmp_path}
   ansible-test sanity
 
 [testenv:mypy-lint]
-allowlist_externals = echo,cd,rm,mkdir,ln
+allowlist_externals = rsync,ln
 labels = future-lint
 description = Run mypi type tests
 set_env =
-  MYPYPATH={envtmpdir}/mypy
+  ANSIBLE_HOME={[common]ansible_home}
+  ANSIBLE_COLLECTIONS_PATH={[common]ansible_collections_path}
+  MYPYPATH={[common]ansible_home}
 deps =
   mypy
   # ansible-core
@@ -246,14 +264,11 @@ deps =
   placebo
   typing_extensions
 commands_pre =
-  rm -rf {[mypy]mypy_path}
-  mkdir -p {[mypy]full_tmp_path}
-  rm -d {[mypy]full_tmp_path}
-  ln -s {toxinidir} {[mypy]full_tmp_path}
-  # Devel version of Ansible includes more typing hints, add it to MYPYPATH
-  ln -s {env_site_packages_dir}/ansible {[mypy]mypy_path}/ansible
+  rsync --delete --exclude=.tox -qraugpo {toxinidir}/ {[common]full_collection_path}/
+  ansible-galaxy collection install git+https://github.com/ansible-collections/community.aws.git
+  ln -s {env_site_packages_dir}/ansible {[common]ansible_collections_path}/ansible
+  ln -s {[common]ansible_home}/collections/ansible_collections {[common]ansible_home}/ansible_collections
 commands =
-  cd {[mypy]full_tmp_path}
   # TODO: passing directories doesn't work well, it's better to pass the package
   # we might want to consider manipulating posargs/directories into the package names
   mypy \
@@ -262,4 +277,3 @@ commands =
     --follow-imports silent \
     -p ansible_collections.amazon.aws.plugins.plugin_utils \
     -p ansible_collections.amazon.aws.plugins.module_utils
-    # {posargs:plugins/module_utils plugins/plugin_utils}