Run fab provider tests in v2-11-test

Since we are releasing fab provider from v2-11-test we should also
run fab provider tests there.

Author: potiuk

airflow/api_connexion/security.py

@@ -45,13 +45,14 @@
 
 def check_authentication() -> None:
     """Check that the request has valid authorization information."""
-    for auth in get_airflow_app().api_auth:
+    airflow_app = get_airflow_app()
+    for auth in airflow_app.api_auth:
         response = auth.requires_authentication(Response)()
         if response.status_code == 200:
             return
 
     # Even if the current_user is anonymous, the AUTH_ROLE_PUBLIC might still have permission.
-    appbuilder = get_airflow_app().appbuilder
+    appbuilder = airflow_app.appbuilder
     if appbuilder.get_app.config.get("AUTH_ROLE_PUBLIC", None):
         return
 

dev/breeze/src/airflow_breeze/utils/selective_checks.py

@@ -55,7 +55,6 @@
     SelectiveProvidersTestType,
     all_helm_test_packages,
     all_selective_core_test_types,
-    providers_test_type,
 )
 from airflow_breeze.utils.console import get_console
 from airflow_breeze.utils.exclude_from_matrix import excluded_combos
@@ -841,49 +840,51 @@ def _get_core_test_types_to_run(self) -> list[str]:
         return sorted_candidate_test_types
 
     def _get_providers_test_types_to_run(self, split_to_individual_providers: bool = False) -> list[str]:
-        if self._default_branch != "main":
-            return []
-        if self.full_tests_needed:
-            if split_to_individual_providers:
-                return list(providers_test_type())
-            else:
-                return ["Providers"]
-        else:
-            all_providers_source_files = self._matching_files(
-                FileGroupForCi.ALL_PROVIDERS_PYTHON_FILES, CI_FILE_GROUP_MATCHES, CI_FILE_GROUP_EXCLUDES
-            )
-            assets_source_files = self._matching_files(
-                FileGroupForCi.ASSET_FILES, CI_FILE_GROUP_MATCHES, CI_FILE_GROUP_EXCLUDES
-            )
-
-            if (
-                len(all_providers_source_files) == 0
-                and len(assets_source_files) == 0
-                and not self.needs_api_tests
-            ):
-                # IF API tests are needed, that will trigger extra provider checks
-                return []
-            else:
-                affected_providers = self._find_all_providers_affected(
-                    include_docs=False,
-                )
-        candidate_test_types: set[str] = set()
-        if isinstance(affected_providers, AllProvidersSentinel):
-            if split_to_individual_providers:
-                for provider in get_available_packages():
-                    candidate_test_types.add(f"Providers[{provider}]")
-            else:
-                candidate_test_types.add("Providers")
-        elif affected_providers:
-            if split_to_individual_providers:
-                for provider in affected_providers:
-                    candidate_test_types.add(f"Providers[{provider}]")
-            else:
-                candidate_test_types.add(f"Providers[{','.join(sorted(affected_providers))}]")
-        sorted_candidate_test_types = sorted(candidate_test_types)
-        get_console().print("[warning]Selected providers test type candidates to run:[/]")
-        get_console().print(sorted_candidate_test_types)
-        return sorted_candidate_test_types
+        # For v2-11-test branch we always run airflow + fab provider tests
+        return ["Providers[fab]"]
+        # if self._default_branch != "main":
+        #     return []
+        # if self.full_tests_needed:
+        #     if split_to_individual_providers:
+        #         return list(providers_test_type())
+        #     else:
+        #         return ["Providers"]
+        # else:
+        #     all_providers_source_files = self._matching_files(
+        #         FileGroupForCi.ALL_PROVIDERS_PYTHON_FILES, CI_FILE_GROUP_MATCHES, CI_FILE_GROUP_EXCLUDES
+        #     )
+        #     assets_source_files = self._matching_files(
+        #         FileGroupForCi.ASSET_FILES, CI_FILE_GROUP_MATCHES, CI_FILE_GROUP_EXCLUDES
+        #     )
+        #
+        #     if (
+        #         len(all_providers_source_files) == 0
+        #         and len(assets_source_files) == 0
+        #         and not self.needs_api_tests
+        #     ):
+        #         # IF API tests are needed, that will trigger extra provider checks
+        #         return []
+        #     else:
+        #         affected_providers = self._find_all_providers_affected(
+        #             include_docs=False,
+        #         )
+        # candidate_test_types: set[str] = set()
+        # if isinstance(affected_providers, AllProvidersSentinel):
+        #     if split_to_individual_providers:
+        #         for provider in get_available_packages():
+        #             candidate_test_types.add(f"Providers[{provider}]")
+        #     else:
+        #         candidate_test_types.add("Providers")
+        # elif affected_providers:
+        #     if split_to_individual_providers:
+        #         for provider in affected_providers:
+        #             candidate_test_types.add(f"Providers[{provider}]")
+        #     else:
+        #         candidate_test_types.add(f"Providers[{','.join(sorted(affected_providers))}]")
+        # sorted_candidate_test_types = sorted(candidate_test_types)
+        # get_console().print("[warning]Selected providers test type candidates to run:[/]")
+        # get_console().print(sorted_candidate_test_types)
+        # return sorted_candidate_test_types
 
     @staticmethod
     def _extract_long_provider_tests(current_test_types: set[str]):
@@ -930,7 +931,8 @@ def providers_test_types_list_as_string(self) -> str | None:
         if self._default_branch != "main":
             test_types_to_remove: set[str] = set()
             for test_type in current_test_types:
-                if test_type.startswith("Providers"):
+                # For v2-11-test branch we always run airflow + fab provider tests
+                if test_type.startswith("Providers") and not test_type.startswith("Providers[fab]"):
                     get_console().print(
                         f"[warning]Removing {test_type} because the target branch "
                         f"is {self._default_branch} and not main[/]"
@@ -1072,7 +1074,8 @@ def docs_list_as_string(self) -> str | None:
         if not self.docs_build:
             return None
         if self._default_branch != "main":
-            return "apache-airflow docker-stack"
+            # For v2-11-test branch we always run airflow + fab provider tests
+            return "apache-airflow docker-stack apache-airflow-providers-fab"
         if self.full_tests_needed:
             return _ALL_DOCS_LIST
         providers_affected = self._find_all_providers_affected(
@@ -1164,13 +1167,15 @@ def skip_pre_commits(self) -> str:
 
     @cached_property
     def skip_providers_tests(self) -> bool:
-        if self._default_branch != "main":
-            return True
-        if self.full_tests_needed:
-            return False
-        if self._get_providers_test_types_to_run():
-            return False
-        return True
+        # For v2-11-test branch we always run airflow + fab provider tests
+        return False
+        # if self._default_branch != "main":
+        #     return True
+        # if self.full_tests_needed:
+        #     return False
+        # if self._get_providers_test_types_to_run():
+        #     return False
+        # return True
 
     @cached_property
     def test_groups(self):
@@ -1200,18 +1205,21 @@ def helm_test_packages(self) -> str:
 
     @cached_property
     def selected_providers_list_as_string(self) -> str | None:
-        if self._default_branch != "main":
-            return None
-        if self.full_tests_needed:
-            return ""
-        if self._are_all_providers_affected():
-            return ""
-        affected_providers = self._find_all_providers_affected(include_docs=True)
-        if not affected_providers:
-            return None
-        if isinstance(affected_providers, AllProvidersSentinel):
-            return ""
-        return " ".join(sorted(affected_providers))
+        # For v2-11-test branch we always test airflow + fab provider
+        return "fab"
+
+        # if self._default_branch != "main":
+        #     return None
+        # if self.full_tests_needed:
+        #     return ""
+        # if self._are_all_providers_affected():
+        #     return ""
+        # affected_providers = self._find_all_providers_affected(include_docs=True)
+        # if not affected_providers:
+        #     return None
+        # if isinstance(affected_providers, AllProvidersSentinel):
+        #     return ""
+        # return " ".join(sorted(affected_providers))
 
     @cached_property
     def runs_on_as_json_default(self) -> str:

scripts/ci/pre_commit/check_system_tests.py

@@ -38,21 +38,21 @@
 WATCHER_APPEND_INSTRUCTION_SHORT = " >> watcher()"
 
 PYTEST_FUNCTION = """
-from tests_common.test_utils.system_tests import get_test_run  # noqa: E402
+from tests.test_utils.system_tests import get_test_run  # noqa: E402
 
 # Needed to run the example DAG with pytest (see: tests/system/README.md#run_via_pytest)
 test_run = get_test_run(dag)
 """
 PYTEST_FUNCTION_PATTERN = re.compile(
-    r"from tests_common\.test_utils\.system_tests import get_test_run(?:  # noqa: E402)?\s+"
+    r"from tests\.test_utils\.system_tests import get_test_run(?:  # noqa: E402)?\s+"
     r"(?:# .+\))?\s+"
     r"test_run = get_test_run\(dag\)"
 )
 
 
 def _check_file(file: Path):
     content = file.read_text()
-    if "from tests_common.test_utils.watcher import watcher" in content:
+    if "from tests.test_utils.watcher import watcher" in content:
         index = content.find(WATCHER_APPEND_INSTRUCTION_SHORT)
         if index == -1:
             errors.append(

tests/providers/fab/auth_manager/api/auth/backend/test_kerberos_auth.py

@@ -16,7 +16,7 @@
 # under the License.
 from __future__ import annotations
 
-from tests_common.test_utils.compat import ignore_provider_compatibility_error
+from tests.test_utils.compat import ignore_provider_compatibility_error
 
 with ignore_provider_compatibility_error("2.9.0+", __file__):
     from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import init_app

tests/providers/fab/auth_manager/api/auth/backend/test_session.py

@@ -20,10 +20,10 @@
 
 import pytest
 from flask import Response
-from tests_common.test_utils.compat import AIRFLOW_V_2_9_PLUS
 
 from airflow.providers.fab.auth_manager.api.auth.backend.session import requires_authentication
 from airflow.www import app as application
+from tests.test_utils.compat import AIRFLOW_V_2_9_PLUS
 
 pytestmark = [
     pytest.mark.skipif(not AIRFLOW_V_2_9_PLUS, reason="Tests for Airflow 2.9.0+ only"),

tests/providers/fab/auth_manager/api_endpoints/api_connexion_utils.py

@@ -18,7 +18,7 @@
 
 from contextlib import contextmanager
 
-from tests_common.test_utils.compat import ignore_provider_compatibility_error
+from tests.test_utils.compat import ignore_provider_compatibility_error
 
 with ignore_provider_compatibility_error("2.9.0+", __file__):
     from airflow.providers.fab.auth_manager.security_manager.override import EXISTING_ROLES