Skip to content

Fix testing tests command to allow passing test as extra arg #43529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 1 commit into from
Oct 31, 2024
Merged

Fix testing tests command to allow passing test as extra arg #43529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev/breeze/doc/images/output_testing_tests.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4e128855ff2df624e0fc59e229b0973d
69c5e660ec3f263dad58cc7a7710d4ed
12 changes: 10 additions & 2 deletions dev/breeze/src/airflow_breeze/commands/testing_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ def _verify_parallelism_parameters(
@option_use_packages_from_dist
@option_use_xdist
@option_verbose
@click.argument("extra_pytest_args", nargs=-1, type=click.UNPROCESSED)
@click.argument("extra_pytest_args", nargs=-1, type=click.Path(path_type=str))
def command_for_tests(**kwargs):
_run_test_command(**kwargs)

Expand Down Expand Up @@ -877,8 +877,16 @@ def _run_test_command(
)
else:
if shell_params.test_type == "Default":
if any([arg.startswith("tests") for arg in extra_pytest_args]):
if any(
[
arg.startswith("tests/")
or arg.startswith("providers/tests/")
or arg.startswith("task_sdk/tests/")
for arg in extra_pytest_args
]
):
# in case some tests are specified as parameters, do not pass "tests" as default
# test_type = "All" as default and it will run all "tests" by default then
shell_params.test_type = "None"
shell_params.parallel_test_types_list = []
else:
Expand Down
6 changes: 6 additions & 0 deletions dev/breeze/src/airflow_breeze/utils/run_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,12 @@ def find_all_other_tests() -> list[str]:
PROVIDERS_LIST_EXCLUDE_PREFIX = "Providers[-"

ALL_TEST_SUITES: dict[str, tuple[str, ...]] = {
# TODO: This is not really correct now - we should allow to run both providers and airflow
# as "ALL" tests - currently it is not possible due to conftest.py present at top-level of
# all different test suites ("tests", "providers/tests", "task_sdk/tests")
# The only reason it is working now in CI is because we run tests in parallel (both DB and non-DB)
# each test subfolder is separately specified in the pytest command line
# This should be solved as part of https://github.com/apache/airflow/issues/42632
"All": ("tests",),
"All-Long": ("tests", "-m", "long_running", "--include-long-running"),
"All-Quarantined": ("tests", "-m", "quarantined", "--include-quarantined"),
Expand Down