From e4cdfb87ffc59f7655bd23b005011f205d2cced9 Mon Sep 17 00:00:00 2001 From: Igor Kholopov Date: Thu, 11 Feb 2021 14:52:51 +0100 Subject: [PATCH] Updating tests.providers.google.cloud.hooks.test_dataflow.TestDataflowJob.test_check_dataflow_job_state_wait_until_finished test --- tests/providers/google/cloud/hooks/test_dataflow.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/providers/google/cloud/hooks/test_dataflow.py b/tests/providers/google/cloud/hooks/test_dataflow.py index 3e6e759448167..a3503005011db 100644 --- a/tests/providers/google/cloud/hooks/test_dataflow.py +++ b/tests/providers/google/cloud/hooks/test_dataflow.py @@ -1315,16 +1315,20 @@ def test_dataflow_job_is_job_running_with_no_job(self): # AWAITING STATE (DataflowJobType.JOB_TYPE_BATCH, DataflowJobStatus.JOB_STATE_PENDING, None, False), (DataflowJobType.JOB_TYPE_STREAMING, DataflowJobStatus.JOB_STATE_PENDING, None, False), + (None, DataflowJobStatus.JOB_STATE_PENDING, None, False), (DataflowJobType.JOB_TYPE_BATCH, DataflowJobStatus.JOB_STATE_PENDING, True, False), (DataflowJobType.JOB_TYPE_STREAMING, DataflowJobStatus.JOB_STATE_PENDING, True, False), + (None, DataflowJobStatus.JOB_STATE_PENDING, True, False), (DataflowJobType.JOB_TYPE_BATCH, DataflowJobStatus.JOB_STATE_PENDING, False, True), (DataflowJobType.JOB_TYPE_STREAMING, DataflowJobStatus.JOB_STATE_PENDING, False, True), + (None, DataflowJobStatus.JOB_STATE_PENDING, False, True), ]) # fmt: on def test_check_dataflow_job_state_wait_until_finished( self, job_type, job_state, wait_until_finished, expected_result ): job = {"id": "id-2", "name": "name-2", "type": job_type, "currentState": job_state} + job = {key: job[key] for key in job if job[key] is not None} dataflow_job = _DataflowJobsController( dataflow=self.mock_dataflow, project_number=TEST_PROJECT, @@ -1345,10 +1349,14 @@ def test_check_dataflow_job_state_wait_until_finished( "Google Cloud Dataflow job name-2 has failed\\."), (DataflowJobType.JOB_TYPE_STREAMING, DataflowJobStatus.JOB_STATE_FAILED, "Google Cloud Dataflow job name-2 has failed\\."), + (None, DataflowJobStatus.JOB_STATE_FAILED, + "Google Cloud Dataflow job name-2 has failed\\."), (DataflowJobType.JOB_TYPE_STREAMING, DataflowJobStatus.JOB_STATE_UNKNOWN, "Google Cloud Dataflow job name-2 was unknown state: JOB_STATE_UNKNOWN"), (DataflowJobType.JOB_TYPE_BATCH, DataflowJobStatus.JOB_STATE_UNKNOWN, "Google Cloud Dataflow job name-2 was unknown state: JOB_STATE_UNKNOWN"), + (None, DataflowJobStatus.JOB_STATE_UNKNOWN, + "Google Cloud Dataflow job name-2 was unknown state: JOB_STATE_UNKNOWN"), (DataflowJobType.JOB_TYPE_BATCH, DataflowJobStatus.JOB_STATE_CANCELLED, "Google Cloud Dataflow job name-2 was cancelled\\."), (DataflowJobType.JOB_TYPE_STREAMING, DataflowJobStatus.JOB_STATE_CANCELLED, @@ -1365,6 +1373,7 @@ def test_check_dataflow_job_state_wait_until_finished( # fmt: on def test_check_dataflow_job_state_terminal_state(self, job_type, job_state, exception_regex): job = {"id": "id-2", "name": "name-2", "type": job_type, "currentState": job_state} + job = {key: job[key] for key in job if job[key] is not None} dataflow_job = _DataflowJobsController( dataflow=self.mock_dataflow, project_number=TEST_PROJECT,