This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 3e9c47e95e Improve selectiveness of selective checks for
"always/tests" case (#35458)
3e9c47e95e is described below
commit 3e9c47e95eb3b170a04ccb51dc0873563dfc2da1
Author: Jarek Potiuk <[email protected]>
AuthorDate: Sun Nov 5 18:39:26 2023 +0100
Improve selectiveness of selective checks for "always/tests" case (#35458)
When we decide which tests should be run we err on a safe side and
when we see that some files were modified that we cannot classify
to specific providers, API, CLI, WWW area, we err on a safe side
and assume that we should run all tests (This is called a
"core/other modified" case. The assumption here is that modificiation
of any of the core code or some of the auxiliary utils might affect
everyone else.
However - we can safely assume that if only "tests/always" files
have been modified, then we can remove them from the list - because
those tests will anyhow will be executed and changing those tests
should have no impact on other tests. Those tests are ALWAYS executed.
iThis will - in some cases - avoid running full test suite when
we really only run a small subset of those.
This was the case for #35457 where it run full test suite, but really
only "Always Providers[common.io]" were needed.
---
.../src/airflow_breeze/utils/selective_checks.py | 14 +++++++++--
dev/breeze/tests/test_selective_checks.py | 28 ++++++++++++++++++++--
2 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/dev/breeze/src/airflow_breeze/utils/selective_checks.py
b/dev/breeze/src/airflow_breeze/utils/selective_checks.py
index 2d398db679..214dbb63a9 100644
--- a/dev/breeze/src/airflow_breeze/utils/selective_checks.py
+++ b/dev/breeze/src/airflow_breeze/utils/selective_checks.py
@@ -77,6 +77,7 @@ class FileGroupForCi(Enum):
ENVIRONMENT_FILES = "environment_files"
PYTHON_PRODUCTION_FILES = "python_scans"
JAVASCRIPT_PRODUCTION_FILES = "javascript_scans"
+ ALWAYS_TESTS_FILES = "always_test_files"
API_TEST_FILES = "api_test_files"
API_CODEGEN_FILES = "api_codegen_files"
HELM_FILES = "helm_files"
@@ -176,6 +177,9 @@ CI_FILE_GROUP_MATCHES = HashableDict(
FileGroupForCi.SYSTEM_TEST_FILES: [
r"^tests/system/",
],
+ FileGroupForCi.ALWAYS_TESTS_FILES: [
+ r"^tests/always/",
+ ],
}
)
@@ -613,11 +617,17 @@ class SelectiveChecks:
kubernetes_files =
self._matching_files(FileGroupForCi.KUBERNETES_FILES, CI_FILE_GROUP_MATCHES)
system_test_files =
self._matching_files(FileGroupForCi.SYSTEM_TEST_FILES, CI_FILE_GROUP_MATCHES)
all_source_files =
self._matching_files(FileGroupForCi.ALL_SOURCE_FILES, CI_FILE_GROUP_MATCHES)
-
+ test_always_files =
self._matching_files(FileGroupForCi.ALWAYS_TESTS_FILES, CI_FILE_GROUP_MATCHES)
remaining_files = (
- set(all_source_files) - set(matched_files) - set(kubernetes_files)
- set(system_test_files)
+ set(all_source_files)
+ - set(matched_files)
+ - set(kubernetes_files)
+ - set(system_test_files)
+ - set(test_always_files)
)
+ get_console().print(f"[warning]Remaining non test/always files:
{len(remaining_files)}[/]")
count_remaining_files = len(remaining_files)
+
if count_remaining_files > 0:
get_console().print(
f"[warning]We should run all tests. There are
{count_remaining_files} changed "
diff --git a/dev/breeze/tests/test_selective_checks.py
b/dev/breeze/tests/test_selective_checks.py
index 4c45e016ab..a50129e2f3 100644
--- a/dev/breeze/tests/test_selective_checks.py
+++ b/dev/breeze/tests/test_selective_checks.py
@@ -439,6 +439,30 @@ def assert_outputs_are_printed(expected_outputs: dict[str,
str], stderr: str):
},
id="Providers tests run including amazon tests if amazon provider
files changed",
),
+ pytest.param(
+ (
+ "tests/always/test_project_structure.py",
+ "tests/providers/common/io/operators/__init__.py",
+ "tests/providers/common/io/operators/test_file_transfer.py",
+ ),
+ {
+ "affected-providers-list-as-string": "common.io",
+ "all-python-versions": "['3.8']",
+ "all-python-versions-list-as-string": "3.8",
+ "python-versions": "['3.8']",
+ "python-versions-list-as-string": "3.8",
+ "ci-image-build": "true",
+ "prod-image-build": "false",
+ "needs-helm-tests": "false",
+ "run-tests": "true",
+ "run-amazon-tests": "false",
+ "docs-build": "false",
+ "run-kubernetes-tests": "false",
+ "upgrade-to-newer-dependencies": "false",
+ "parallel-test-types-list-as-string": "Always
Providers[common.io]",
+ },
+ id="Only Always and Common.IO tests should run when only common.io
and tests/always changed",
+ ),
],
)
def test_expected_output_pull_request_main(
@@ -676,7 +700,7 @@ def test_expected_output_full_tests_needed(
),
],
)
-def test_expected_output_pull_request_v2_3(
+def test_expected_output_pull_request_v2_7(
files: tuple[str, ...],
expected_outputs: dict[str, str],
):
@@ -685,7 +709,7 @@ def test_expected_output_pull_request_v2_3(
commit_ref="HEAD",
github_event=GithubEvents.PULL_REQUEST,
pr_labels=(),
- default_branch="v2-3-stable",
+ default_branch="v2-7-stable",
)
assert_outputs_are_printed(expected_outputs, str(stderr))
