Skip to content

Commit c4c72ef

Browse files
committed
Try fix unit tests error
1 parent 593e14a commit c4c72ef

3 files changed

Lines changed: 2 additions & 9 deletions

File tree

airflow-core/src/airflow/config_templates/provider_config_fallback_defaults.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ flower_url_prefix =
6060
flower_port = 5555
6161
flower_basic_auth =
6262
sync_parallelism = 0
63-
celery_config_options = airflow.config_templates.default_celery.DEFAULT_CELERY_CONFIG
63+
celery_config_options = airflow.providers.celery.executors.default_celery.DEFAULT_CELERY_CONFIG
6464
ssl_active = False
6565
ssl_key =
6666
ssl_cert =

airflow-core/src/airflow/configuration.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -629,18 +629,12 @@ def write_default_airflow_configuration_if_needed() -> AirflowConfigParser:
629629
conf._configuration_description["core"]["options"]["fernet_key"]["default"] = (
630630
_SecretKeys.fernet_key
631631
)
632-
conf._base_configuration_description["core"]["options"]["fernet_key"]["default"] = (
633-
_SecretKeys.fernet_key
634-
)
635632
conf._default_values.set("core", "fernet_key", _SecretKeys.fernet_key)
636633

637634
_SecretKeys.jwt_secret_key = b64encode(os.urandom(16)).decode("utf-8")
638635
conf._configuration_description["api_auth"]["options"]["jwt_secret"]["default"] = (
639636
_SecretKeys.jwt_secret_key
640637
)
641-
conf._base_configuration_description["api_auth"]["options"]["jwt_secret"]["default"] = (
642-
_SecretKeys.jwt_secret_key
643-
)
644638
conf._default_values.set("api_auth", "jwt_secret", _SecretKeys.jwt_secret_key)
645639
# Invalidate cached configuration_description so it recomputes with the updated base
646640
conf.__dict__.pop("configuration_description", None)

shared/configuration/src/airflow_shared/configuration/parser.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ def configuration_description(self) -> dict[str, dict[str, Any]]:
303303
if not self._use_providers_configuration:
304304
return self._configuration_description
305305

306-
merged_description: dict[str, dict[str, Any]] = deepcopy(self._base_configuration_description)
306+
merged_description: dict[str, dict[str, Any]] = deepcopy(self._configuration_description)
307307

308308
# Merge default values from cfg-based fallbacks (these only have key=value,
309309
# no metadata, but ensure sections/options exist with at least a default).
@@ -474,7 +474,6 @@ def __init__(
474474
"""
475475
super().__init__(*args, **kwargs)
476476
self._configuration_description = configuration_description
477-
self._base_configuration_description = deepcopy(configuration_description)
478477
self._default_values = _default_values
479478
self._provider_manager_type = provider_manager_type
480479
self._create_default_config_parser_callable = create_default_config_parser_callable

0 commit comments

Comments
 (0)