Skip to content

Commit 139be53

Browse files
Fix mypy tests providers part 2 (#20111)
1 parent 50bf536 commit 139be53

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

tests/providers/cncf/kubernetes/utils/test_pod_launcher.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import pendulum
2121
import pytest
2222
from kubernetes.client.rest import ApiException
23-
from requests.exceptions import BaseHTTPError
23+
from urllib3.exceptions import HTTPError as BaseHTTPError
2424

2525
from airflow.exceptions import AirflowException
2626
from airflow.providers.cncf.kubernetes.utils.pod_launcher import PodLauncher, PodStatus

tests/providers/google/cloud/operators/test_datacatalog.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ def test_assert_valid_hook_call(self, mock_hook) -> None:
610610
class TestCloudDataCatalogListTagsOperator(TestCase):
611611
@mock.patch(
612612
"airflow.providers.google.cloud.operators.datacatalog.CloudDataCatalogHook",
613-
**{"return_value.list_tags.return_value": [TEST_TAG]}, # type: ignore
613+
return_value=mock.MagicMock(list_tags=mock.MagicMock(return_value=[TEST_TAG])),
614614
)
615615
def test_assert_valid_hook_call(self, mock_hook) -> None:
616616
task = CloudDataCatalogListTagsOperator(
@@ -777,7 +777,7 @@ class TestCloudDataCatalogUpdateTagOperator(TestCase):
777777
def test_assert_valid_hook_call(self, mock_hook) -> None:
778778
task = CloudDataCatalogUpdateTagOperator(
779779
task_id="task_id",
780-
tag=TEST_TAG_ID,
780+
tag=Tag(name=TEST_TAG_ID),
781781
update_mask=TEST_UPDATE_MASK,
782782
location=TEST_LOCATION,
783783
entry_group=TEST_ENTRY_GROUP_ID,
@@ -796,7 +796,7 @@ def test_assert_valid_hook_call(self, mock_hook) -> None:
796796
impersonation_chain=TEST_IMPERSONATION_CHAIN,
797797
)
798798
mock_hook.return_value.update_tag.assert_called_once_with(
799-
tag=TEST_TAG_ID,
799+
tag=Tag(name=TEST_TAG_ID),
800800
update_mask=TEST_UPDATE_MASK,
801801
location=TEST_LOCATION,
802802
entry_group=TEST_ENTRY_GROUP_ID,
@@ -814,7 +814,7 @@ class TestCloudDataCatalogUpdateTagTemplateOperator(TestCase):
814814
def test_assert_valid_hook_call(self, mock_hook) -> None:
815815
task = CloudDataCatalogUpdateTagTemplateOperator(
816816
task_id="task_id",
817-
tag_template=TEST_TAG_TEMPLATE_ID,
817+
tag_template=TagTemplate(name=TEST_TAG_TEMPLATE_ID),
818818
update_mask=TEST_UPDATE_MASK,
819819
location=TEST_LOCATION,
820820
tag_template_id=TEST_TAG_TEMPLATE_ID,
@@ -831,7 +831,7 @@ def test_assert_valid_hook_call(self, mock_hook) -> None:
831831
impersonation_chain=TEST_IMPERSONATION_CHAIN,
832832
)
833833
mock_hook.return_value.update_tag_template.assert_called_once_with(
834-
tag_template=TEST_TAG_TEMPLATE_ID,
834+
tag_template=TagTemplate(name=TEST_TAG_TEMPLATE_ID),
835835
update_mask=TEST_UPDATE_MASK,
836836
location=TEST_LOCATION,
837837
tag_template_id=TEST_TAG_TEMPLATE_ID,

tests/providers/google/cloud/operators/test_dataproc_metastore.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def test_assert_valid_hook_call(self, mock_metadata_import, mock_hook) -> None:
110110
project_id=GCP_PROJECT_ID,
111111
region=GCP_LOCATION,
112112
service_id=TEST_SERVICE_ID,
113-
metadata_import=TEST_METADATA_IMPORT,
113+
metadata_import=mock_metadata_import(name=TEST_METADATA_IMPORT),
114114
metadata_import_id=TEST_METADATA_IMPORT_ID,
115115
retry=TEST_RETRY,
116116
timeout=TEST_TIMEOUT,
@@ -126,7 +126,7 @@ def test_assert_valid_hook_call(self, mock_metadata_import, mock_hook) -> None:
126126
project_id=GCP_PROJECT_ID,
127127
region=GCP_LOCATION,
128128
service_id=TEST_SERVICE_ID,
129-
metadata_import=TEST_METADATA_IMPORT,
129+
metadata_import=mock_metadata_import(name=TEST_METADATA_IMPORT),
130130
metadata_import_id=TEST_METADATA_IMPORT_ID,
131131
request_id=None,
132132
retry=TEST_RETRY,

tests/providers/google/cloud/sensors/test_bigquery_dts.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import unittest
2020
from unittest import mock
21+
from unittest.mock import MagicMock as MM
2122

2223
from google.cloud.bigquery_datatransfer_v1 import TransferState
2324

@@ -31,7 +32,7 @@
3132
class TestBigQueryDataTransferServiceTransferRunSensor(unittest.TestCase):
3233
@mock.patch(
3334
"airflow.providers.google.cloud.sensors.bigquery_dts.BiqQueryDataTransferServiceHook",
34-
**{'return_value.get_transfer_run.return_value.state': TransferState.FAILED},
35+
return_value=MM(get_transfer_run=MM(return_value=MM(state=TransferState.FAILED))),
3536
)
3637
def test_poke_returns_false(self, mock_hook):
3738
op = BigQueryDataTransferServiceTransferRunSensor(
@@ -55,7 +56,7 @@ def test_poke_returns_false(self, mock_hook):
5556

5657
@mock.patch(
5758
"airflow.providers.google.cloud.sensors.bigquery_dts.BiqQueryDataTransferServiceHook",
58-
**{'return_value.get_transfer_run.return_value.state': TransferState.SUCCEEDED},
59+
return_value=MM(get_transfer_run=MM(return_value=MM(state=TransferState.SUCCEEDED))),
5960
)
6061
def test_poke_returns_true(self, mock_hook):
6162
op = BigQueryDataTransferServiceTransferRunSensor(

0 commit comments

Comments
 (0)