This is an automated email from the ASF dual-hosted git repository.
amoghdesai 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 d6a05d67988 Remove residual occurences of 'merge_conn' from cncf tests
(#52064)
d6a05d67988 is described below
commit d6a05d6798895d9ab05833674d450dae246df809
Author: Amogh Desai <[email protected]>
AuthorDate: Mon Jun 23 13:34:00 2025 +0530
Remove residual occurences of 'merge_conn' from cncf tests (#52064)
---
.../tests/unit/cncf/kubernetes/hooks/test_kubernetes.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git
a/providers/cncf/kubernetes/tests/unit/cncf/kubernetes/hooks/test_kubernetes.py
b/providers/cncf/kubernetes/tests/unit/cncf/kubernetes/hooks/test_kubernetes.py
index 4f28a305cbe..ad1b07ebf48 100644
---
a/providers/cncf/kubernetes/tests/unit/cncf/kubernetes/hooks/test_kubernetes.py
+++
b/providers/cncf/kubernetes/tests/unit/cncf/kubernetes/hooks/test_kubernetes.py
@@ -37,7 +37,6 @@ from airflow.exceptions import AirflowException,
AirflowNotFoundException
from airflow.hooks.base import BaseHook
from airflow.models import Connection
from airflow.providers.cncf.kubernetes.hooks.kubernetes import
AsyncKubernetesHook, KubernetesHook
-from airflow.utils.db import merge_conn
from tests_common.test_utils.db import clear_db_connections
from tests_common.test_utils.providers import get_provider_min_airflow_version
@@ -840,9 +839,9 @@ class TestAsyncKubernetesHook:
@staticmethod
@pytest.fixture
- def kubernetes_connection():
+ def kubernetes_connection(create_connection_without_db):
extra = {"kube_config": '{"test": "kube"}'}
- merge_conn(
+ create_connection_without_db(
Connection(
conn_type="kubernetes",
conn_id=CONN_ID,
@@ -910,12 +909,12 @@ class TestAsyncKubernetesHook:
@mock.patch(INCLUSTER_CONFIG_LOADER)
@mock.patch(KUBE_CONFIG_MERGER)
async def test_load_config_with_conn_id_kube_config_path(
- self, kube_config_merger, incluster_config, kube_config_loader,
tmp_path
+ self, kube_config_merger, incluster_config, kube_config_loader,
tmp_path, create_connection_without_db
):
file_name = f"{tmp_path}/config"
extra = {"kube_config_path": file_name}
try:
- merge_conn(
+ create_connection_without_db(
Connection(
conn_type="kubernetes",
conn_id=CONN_ID,
