From bc7c9b24c7fd8f75e979a1ea5a3562005f0ab8c4 Mon Sep 17 00:00:00 2001 From: Hussein Awala Date: Thu, 31 Aug 2023 01:17:26 +0200 Subject: [PATCH 1/3] Replace single element slice by next() in Airflow tests --- tests/jobs/test_triggerer_job.py | 2 +- tests/providers/amazon/aws/secrets/test_systems_manager.py | 4 ++-- .../cncf/kubernetes/executors/test_kubernetes_executor.py | 2 +- tests/providers/google/cloud/operators/test_bigquery.py | 4 ++-- tests/providers/qubole/operators/test_qubole.py | 2 +- tests/system/providers/amazon/aws/utils/__init__.py | 4 ++-- tests/www/views/test_views_base.py | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/jobs/test_triggerer_job.py b/tests/jobs/test_triggerer_job.py index bd71c3c9ed6fa..32f7311500aa0 100644 --- a/tests/jobs/test_triggerer_job.py +++ b/tests/jobs/test_triggerer_job.py @@ -567,7 +567,7 @@ def test_trigger_failing(session): for _ in range(30): if job_runner.trigger_runner.failed_triggers: assert len(job_runner.trigger_runner.failed_triggers) == 1 - trigger_id, exc = list(job_runner.trigger_runner.failed_triggers)[0] + trigger_id, exc = next(iter(job_runner.trigger_runner.failed_triggers)) assert trigger_id == 1 assert isinstance(exc, ValueError) assert exc.args[0] == "Deliberate trigger failure" diff --git a/tests/providers/amazon/aws/secrets/test_systems_manager.py b/tests/providers/amazon/aws/secrets/test_systems_manager.py index 9b303a14e1ae2..1f40b560b3462 100644 --- a/tests/providers/amazon/aws/secrets/test_systems_manager.py +++ b/tests/providers/amazon/aws/secrets/test_systems_manager.py @@ -157,11 +157,11 @@ def test_get_variable_non_existent_key(self): @mock.patch("airflow.providers.amazon.aws.hooks.base_aws.SessionFactory") def test_passing_client_kwargs(self, mock_session_factory): backends = initialize_secrets_backends() - systems_manager = [ + systems_manager = next( backend for backend in backends if backend.__class__.__name__ == "SystemsManagerParameterStoreBackend" - ][0] + ) # Mock SessionFactory, session and client mock_session_factory_instance = mock_session_factory.return_value diff --git a/tests/providers/cncf/kubernetes/executors/test_kubernetes_executor.py b/tests/providers/cncf/kubernetes/executors/test_kubernetes_executor.py index 3bb886a8e206a..6f82ae8854706 100644 --- a/tests/providers/cncf/kubernetes/executors/test_kubernetes_executor.py +++ b/tests/providers/cncf/kubernetes/executors/test_kubernetes_executor.py @@ -450,7 +450,7 @@ def test_invalid_executor_config(self, mock_get_kube_client, mock_kubernetes_job ), ) - assert list(executor.event_buffer.values())[0][1] == "Invalid executor_config passed" + assert next(iter(executor.event_buffer.values()))[1] == "Invalid executor_config passed" finally: executor.end() diff --git a/tests/providers/google/cloud/operators/test_bigquery.py b/tests/providers/google/cloud/operators/test_bigquery.py index 4c5cd6f717b88..da61efa557c54 100644 --- a/tests/providers/google/cloud/operators/test_bigquery.py +++ b/tests/providers/google/cloud/operators/test_bigquery.py @@ -730,7 +730,7 @@ def test_bigquery_operator_extra_serialized_field_when_single_query( ] # Check DeSerialized version of operator link - assert isinstance(list(simple_task.operator_extra_links)[0], BigQueryConsoleLink) + assert isinstance(next(iter(simple_task.operator_extra_links)), BigQueryConsoleLink) ti.xcom_push("job_id_path", TEST_FULL_JOB_ID) @@ -768,7 +768,7 @@ def test_bigquery_operator_extra_serialized_field_when_multiple_queries( ] # Check DeSerialized version of operator link - assert isinstance(list(simple_task.operator_extra_links)[0], BigQueryConsoleIndexableLink) + assert isinstance(next(iter(simple_task.operator_extra_links)), BigQueryConsoleIndexableLink) ti.xcom_push(key="job_id_path", value=[TEST_FULL_JOB_ID, TEST_FULL_JOB_ID_2]) diff --git a/tests/providers/qubole/operators/test_qubole.py b/tests/providers/qubole/operators/test_qubole.py index a3cb581133b60..a1e9a80dc863e 100644 --- a/tests/providers/qubole/operators/test_qubole.py +++ b/tests/providers/qubole/operators/test_qubole.py @@ -153,7 +153,7 @@ def test_extra_serialized_field(self, dag_maker, create_task_instance_of_operato simple_task = dag.task_dict[TASK_ID] assert getattr(simple_task, "qubole_conn_id") == TEST_CONN - assert isinstance(list(simple_task.operator_extra_links)[0], QDSLink) + assert isinstance(next(iter(simple_task.operator_extra_links)), QDSLink) ti.xcom_push("qbol_cmd_id", 12345) url = simple_task.get_extra_links(ti, "Go to QDS") diff --git a/tests/system/providers/amazon/aws/utils/__init__.py b/tests/system/providers/amazon/aws/utils/__init__.py index f7dd65fdfd363..b1993e5708a04 100644 --- a/tests/system/providers/amazon/aws/utils/__init__.py +++ b/tests/system/providers/amazon/aws/utils/__init__.py @@ -64,9 +64,9 @@ def _get_test_name() -> str: """ # The exact layer of the stack will depend on if this is called directly # or from another helper, but the test will always contain the identifier. - test_filename: str = [ + test_filename: str = next( frame.filename for frame in inspect.stack() if TEST_FILE_IDENTIFIER in frame.filename - ][0] + ) return splitext(basename(test_filename))[0] diff --git a/tests/www/views/test_views_base.py b/tests/www/views/test_views_base.py index 2ba8795cf1bbe..234943e59ccae 100644 --- a/tests/www/views/test_views_base.py +++ b/tests/www/views/test_views_base.py @@ -251,7 +251,7 @@ def test_views_get(request, url, client, content): def _check_task_stats_json(resp): - return set(list(resp.json.items())[0][1][0].keys()) == {"state", "count"} + return set(next(iter(resp.json.items()))[1][0].keys()) == {"state", "count"} @pytest.mark.parametrize( From 414d1ea3b65256ce11a315ade390f49731ed3f06 Mon Sep 17 00:00:00 2001 From: Hussein Awala Date: Thu, 31 Aug 2023 01:30:43 +0200 Subject: [PATCH 2/3] revert qubole change --- tests/providers/qubole/operators/test_qubole.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/providers/qubole/operators/test_qubole.py b/tests/providers/qubole/operators/test_qubole.py index a1e9a80dc863e..a3cb581133b60 100644 --- a/tests/providers/qubole/operators/test_qubole.py +++ b/tests/providers/qubole/operators/test_qubole.py @@ -153,7 +153,7 @@ def test_extra_serialized_field(self, dag_maker, create_task_instance_of_operato simple_task = dag.task_dict[TASK_ID] assert getattr(simple_task, "qubole_conn_id") == TEST_CONN - assert isinstance(next(iter(simple_task.operator_extra_links)), QDSLink) + assert isinstance(list(simple_task.operator_extra_links)[0], QDSLink) ti.xcom_push("qbol_cmd_id", 12345) url = simple_task.get_extra_links(ti, "Go to QDS") From 79036909f2d4e17634a78db85d48f2af385a12ba Mon Sep 17 00:00:00 2001 From: Hussein Awala Date: Thu, 31 Aug 2023 09:02:46 +0200 Subject: [PATCH 3/3] Update test_views_base.py Co-authored-by: Tzu-ping Chung --- tests/www/views/test_views_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/www/views/test_views_base.py b/tests/www/views/test_views_base.py index 234943e59ccae..4f3ccaeac7bb9 100644 --- a/tests/www/views/test_views_base.py +++ b/tests/www/views/test_views_base.py @@ -251,7 +251,7 @@ def test_views_get(request, url, client, content): def _check_task_stats_json(resp): - return set(next(iter(resp.json.items()))[1][0].keys()) == {"state", "count"} + return set(next(iter(resp.json.items()))[1][0]) == {"state", "count"} @pytest.mark.parametrize(