Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace single quotes by double quotes in tests #33864

Merged
merged 3 commits into from
Sep 3, 2023
Merged

Replace single quotes by double quotes in tests #33864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d05d19
Replace single quotes by double quotes in tests
hussein-awala Aug 28, 2023
e9ad6e9
Remove all fmt off/on
hussein-awala Aug 30, 2023
45adbd3
revert changes on tests/dags/test_imports.py
hussein-awala Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions airflow/providers/amazon/aws/triggers/ecs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,11 @@ def serialize(self) -> tuple[str, dict[str, Any]]:
)

async def run(self) -> AsyncIterator[TriggerEvent]:
# fmt: off
async with EcsHook(aws_conn_id=self.aws_conn_id, region_name=self.region).async_conn as ecs_client,\
AwsLogsHook(aws_conn_id=self.aws_conn_id, region_name=self.region).async_conn as logs_client:
# fmt: on
async with EcsHook(
aws_conn_id=self.aws_conn_id, region_name=self.region
).async_conn as ecs_client, AwsLogsHook(
aws_conn_id=self.aws_conn_id, region_name=self.region
).async_conn as logs_client:
waiter = ecs_client.get_waiter("tasks_stopped")
logs_token = None
while self.waiter_max_attempts:
Expand Down
198 changes: 71 additions & 127 deletions tests/providers/google/cloud/hooks/test_dataflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,13 +954,11 @@ def test_start_template_dataflow_with_runtime_env(self, mock_conn, mock_dataflow

dataflowjob_instance = mock_dataflowjob.return_value
dataflowjob_instance.wait_for_done.return_value = None
# fmt: off
method = (mock_conn.return_value
.projects.return_value
.locations.return_value
.templates.return_value
.launch)
# fmt: on

method = (
mock_conn.return_value.projects.return_value.locations.return_value.templates.return_value.launch
)

method.return_value.execute.return_value = {"job": {"id": TEST_JOB_ID}}
self.dataflow_hook.start_template_dataflow(
job_name=JOB_NAME,
Expand Down Expand Up @@ -1003,13 +1001,11 @@ def test_start_template_dataflow_update_runtime_env(self, mock_conn, mock_datafl

dataflowjob_instance = mock_dataflowjob.return_value
dataflowjob_instance.wait_for_done.return_value = None
# fmt: off
method = (mock_conn.return_value
.projects.return_value
.locations.return_value
.templates.return_value
.launch)
# fmt: on

method = (
mock_conn.return_value.projects.return_value.locations.return_value.templates.return_value.launch
)

method.return_value.execute.return_value = {"job": {"id": TEST_JOB_ID}}
self.dataflow_hook.start_template_dataflow(
job_name=JOB_NAME,
Expand Down Expand Up @@ -1185,14 +1181,11 @@ def test_dataflow_job_init_without_job_id(self):

mock_list = self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.list
(mock_list.return_value.execute.return_value) = {"jobs": [job]}
# fmt: off

(
self.mock_dataflow.projects.return_value.
locations.return_value.
jobs.return_value.
list_next.return_value
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.list_next.return_value
) = None
# fmt: on

_DataflowJobsController(
self.mock_dataflow, TEST_PROJECT, TEST_LOCATION, 10, UNIQUE_JOB_NAME
).get_jobs()
Expand All @@ -1206,23 +1199,14 @@ def test_dataflow_job_wait_for_multiple_jobs(self):
"type": DataflowJobType.JOB_TYPE_BATCH,
"currentState": DataflowJobStatus.JOB_STATE_DONE,
}
# fmt: off

(
self.mock_dataflow.projects.return_value.
locations.return_value.
jobs.return_value.
list.return_value.
execute.return_value
) = {
"jobs": [job, job]
}
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.list.return_value.execute.return_value
) = {"jobs": [job, job]}
(
self.mock_dataflow.projects.return_value.
locations.return_value.
jobs.return_value.
list_next.return_value
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.list_next.return_value
) = None
# fmt: on

dataflow_job = _DataflowJobsController(
dataflow=self.mock_dataflow,
project_number=TEST_PROJECT,
Expand All @@ -1235,13 +1219,13 @@ def test_dataflow_job_wait_for_multiple_jobs(self):
)
dataflow_job.wait_for_done()

# fmt: off
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.\
list.assert_called_once_with(location=TEST_LOCATION, projectId=TEST_PROJECT)
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.list.assert_called_once_with(
location=TEST_LOCATION, projectId=TEST_PROJECT
)

self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.list\
.return_value.execute.assert_called_once_with(num_retries=20)
# fmt: on
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.list.return_value.execute.assert_called_once_with(
num_retries=20
)

assert dataflow_job.get_jobs() == [job, job]

Expand All @@ -1259,34 +1243,29 @@ def test_dataflow_job_wait_for_multiple_jobs(self):
],
)
def test_dataflow_job_wait_for_multiple_jobs_and_one_in_terminal_state(self, state, exception_regex):
# fmt: off

(
self.mock_dataflow.projects.return_value.
locations.return_value.
jobs.return_value.
list.return_value.
execute.return_value
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.list.return_value.execute.return_value
) = {
"jobs": [
{
"id": "id-1", "name": "name-1",
"id": "id-1",
"name": "name-1",
"type": DataflowJobType.JOB_TYPE_BATCH,
"currentState": DataflowJobStatus.JOB_STATE_DONE
"currentState": DataflowJobStatus.JOB_STATE_DONE,
},
{
"id": "id-2", "name": "name-2",
"id": "id-2",
"name": "name-2",
"type": DataflowJobType.JOB_TYPE_BATCH,
"currentState": state
}
"currentState": state,
},
]
}
(
self.mock_dataflow.projects.return_value.
locations.return_value.
jobs.return_value.
list_next.return_value
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.list_next.return_value
) = None
# fmt: on

dataflow_job = _DataflowJobsController(
dataflow=self.mock_dataflow,
project_number=TEST_PROJECT,
Expand All @@ -1301,30 +1280,24 @@ def test_dataflow_job_wait_for_multiple_jobs_and_one_in_terminal_state(self, sta
dataflow_job.wait_for_done()

def test_dataflow_job_wait_for_multiple_jobs_and_streaming_jobs(self):
# fmt: off

mock_jobs_list = (
self.mock_dataflow.projects.return_value.
locations.return_value.
jobs.return_value.
list
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.list
)
mock_jobs_list.return_value.execute.return_value = {
"jobs": [
{
"id": "id-2",
"name": "name-2",
"currentState": DataflowJobStatus.JOB_STATE_RUNNING,
"type": DataflowJobType.JOB_TYPE_STREAMING
"type": DataflowJobType.JOB_TYPE_STREAMING,
}
]
}
(
self.mock_dataflow.projects.return_value.
locations.return_value.
jobs.return_value.
list_next.return_value
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.list_next.return_value
) = None
# fmt: on

dataflow_job = _DataflowJobsController(
dataflow=self.mock_dataflow,
project_number=TEST_PROJECT,
Expand All @@ -1346,17 +1319,15 @@ def test_dataflow_job_wait_for_single_jobs(self):
"type": DataflowJobType.JOB_TYPE_BATCH,
"currentState": DataflowJobStatus.JOB_STATE_DONE,
}
# fmt: off
self.mock_dataflow.projects.return_value.locations.return_value. \
jobs.return_value.get.return_value.execute.return_value = job

(
self.mock_dataflow.projects.return_value.
locations.return_value.
jobs.return_value.
list_next.return_value
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.get.return_value.execute.return_value
) = job

(
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.list_next.return_value
) = None
# fmt: on

dataflow_job = _DataflowJobsController(
dataflow=self.mock_dataflow,
project_number=TEST_PROJECT,
Expand All @@ -1368,37 +1339,27 @@ def test_dataflow_job_wait_for_single_jobs(self):
multiple_jobs=False,
)
dataflow_job.wait_for_done()
# fmt: off
self.mock_dataflow.projects.return_value.locations.return_value. \
jobs.return_value.get.assert_called_once_with(
jobId=TEST_JOB_ID,
location=TEST_LOCATION,
projectId=TEST_PROJECT
)

self.mock_dataflow.projects.return_value.locations.return_value. \
jobs.return_value.get.return_value.execute.assert_called_once_with(num_retries=20)
# fmt: on
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.get.assert_called_once_with(
jobId=TEST_JOB_ID, location=TEST_LOCATION, projectId=TEST_PROJECT
)

self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.get.return_value.execute.assert_called_once_with(
num_retries=20
)

assert dataflow_job.get_jobs() == [job]

def test_dataflow_job_is_job_running_with_no_job(self):
# fmt: off

mock_jobs_list = (
self.mock_dataflow.projects.return_value.
locations.return_value.
jobs.return_value.
list
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.list
)
mock_jobs_list.return_value.execute.return_value = {
"jobs": []
}
mock_jobs_list.return_value.execute.return_value = {"jobs": []}
(
self.mock_dataflow.projects.return_value.
locations.return_value.
jobs.return_value.
list_next.return_value
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.list_next.return_value
) = None
# fmt: on

dataflow_job = _DataflowJobsController(
dataflow=self.mock_dataflow,
project_number=TEST_PROJECT,
Expand Down Expand Up @@ -1649,13 +1610,12 @@ def test_dataflow_job_cancel_or_drain_job(self, drain_pipeline, job_type, reques
}
get_method = self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.get
get_method.return_value.execute.return_value = job
# fmt: off
job_list_nest_method = (self.mock_dataflow
.projects.return_value.
locations.return_value.
jobs.return_value.list_next)

job_list_nest_method = (
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.list_next
)
job_list_nest_method.return_value = None
# fmt: on

dataflow_job = _DataflowJobsController(
dataflow=self.mock_dataflow,
project_number=TEST_PROJECT,
Expand Down Expand Up @@ -1713,24 +1673,14 @@ def test_dataflow_job_cancel_job_no_running_jobs(self):
mock_jobs.return_value.update.assert_not_called()

def test_fetch_list_job_messages_responses(self):
# fmt: off

mock_list = (
self.mock_dataflow
.projects.return_value
.locations.return_value
.jobs.return_value
.messages.return_value
.list
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.messages.return_value.list
)
mock_list_next = (
self.mock_dataflow.
projects.return_value.
locations.return_value.
jobs.return_value
.messages.return_value
.list_next
)
# fmt: on
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.messages.return_value.list_next
)

mock_list.return_value.execute.return_value = "response_1"
mock_list_next.return_value = None

Expand All @@ -1749,16 +1699,10 @@ def test_fetch_list_job_messages_responses(self):
assert result == ["response_1"]

def test_fetch_all_jobs_when_no_jobs_returned(self):
# fmt: off

(
self.mock_dataflow
.projects.return_value
.locations.return_value
.jobs.return_value
.list.return_value
.execute.return_value
self.mock_dataflow.projects.return_value.locations.return_value.jobs.return_value.list.return_value.execute.return_value
) = {}
# fmt: on

jobs_controller = _DataflowJobsController(
dataflow=self.mock_dataflow,
Expand Down
Loading