From 3b0068e06cff4644403a8e73c1384b63cc833ac8 Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Tue, 27 Aug 2024 22:20:58 +0200 Subject: [PATCH] Fix mocking in cncf.kubernetes tests after get_connections removal The #41733 removed deprecated get_connections but it was still used in cncf.kubernetes tests. --- .../cloud/operators/test_kubernetes_engine.py | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/providers/google/cloud/operators/test_kubernetes_engine.py b/tests/providers/google/cloud/operators/test_kubernetes_engine.py index eae6f27a5c38a..d11a5af90a1cf 100644 --- a/tests/providers/google/cloud/operators/test_kubernetes_engine.py +++ b/tests/providers/google/cloud/operators/test_kubernetes_engine.py @@ -342,7 +342,7 @@ def test_config_file_throws_error(self): @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(KUB_OPERATOR_EXEC) @@ -357,7 +357,7 @@ def test_execute_with_impersonation_service_account( @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(KUB_OPERATOR_EXEC) @@ -615,7 +615,7 @@ def test_execute_non_autoscaled_cluster_check_error( @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(TEMP_FILE) @@ -634,7 +634,7 @@ def test_execute_with_impersonation_service_account( @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(TEMP_FILE) @@ -942,7 +942,7 @@ def test_config_file_throws_error(self): @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(KUB_JOB_OPERATOR_EXEC) @@ -959,7 +959,7 @@ def test_execute_with_impersonation_service_account( @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(KUB_JOB_OPERATOR_EXEC) @@ -1042,7 +1042,7 @@ def test_execute(self, mock_job_hook, mock_hook, fetch_cluster_info_mock, file_m @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(TEMP_FILE) @@ -1060,7 +1060,7 @@ def test_execute_with_impersonation_service_account( @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(TEMP_FILE) @@ -1141,7 +1141,7 @@ def test_execute(self, mock_hook, fetch_cluster_info_mock, file_mock, exec_mock) @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(KUB_CREATE_RES_OPERATOR_EXEC) @@ -1158,7 +1158,7 @@ def test_execute_with_impersonation_service_account( @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(KUB_CREATE_RES_OPERATOR_EXEC) @@ -1202,7 +1202,7 @@ def test_execute(self, mock_hook, fetch_cluster_info_mock, file_mock, exec_mock) @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(KUB_DELETE_RES_OPERATOR_EXEC) @@ -1219,7 +1219,7 @@ def test_execute_with_impersonation_service_account( @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(KUB_DELETE_RES_OPERATOR_EXEC) @@ -1281,7 +1281,7 @@ def test_config_file_throws_error(self): @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(KUB_JOB_OPERATOR_EXEC) @@ -1298,7 +1298,7 @@ def test_execute_with_impersonation_service_account( @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(KUB_JOB_OPERATOR_EXEC) @@ -1393,7 +1393,7 @@ def test_config_file_throws_error(self): @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(DEL_KUB_JOB_OPERATOR_EXEC) @@ -1410,7 +1410,7 @@ def test_execute_with_impersonation_service_account( @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(DEL_KUB_JOB_OPERATOR_EXEC) @@ -1499,7 +1499,7 @@ def test_execute(self, mock_job_hook, mock_hook, fetch_cluster_info_mock, file_m @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(TEMP_FILE) @@ -1517,7 +1517,7 @@ def test_execute_with_impersonation_service_account( @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(TEMP_FILE) @@ -1607,7 +1607,7 @@ def test_execute(self, mock_job_hook, mock_hook, fetch_cluster_info_mock, file_m @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(TEMP_FILE) @@ -1625,7 +1625,7 @@ def test_execute_with_impersonation_service_account( @mock.patch.dict(os.environ, {}) @mock.patch( - "airflow.hooks.base.BaseHook.get_connections", + "airflow.hooks.base.BaseHook.get_connection", return_value=[Connection(extra=json.dumps({"keyfile_dict": '{"private_key": "r4nd0m_k3y"}'}))], ) @mock.patch(TEMP_FILE)