Provider Migration: Update beam for Airflow 3.0 compatibility #52607
+63
−21
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comment on lines
+133
to
+136
| mock_ti.xcom_push.assert_called_once_with(key="dataflow_job_id", value=sample_df_job_id) | ||
| mock_ti.xcom_push.reset_mock() | ||
| op.dataflow_job_id = "sample_df_job_same_value_id" | ||
| mock_ti.xcom_push.assert_not_called() |
There was a problem hiding this comment.
Could we rewrite this using a more pytest-native style instead of unittest.mock assertions like assert_not_called or assert_called_once_with?
It would help improve consistency and readability across the test suite.
Comment on lines
+127
to
+136
| mock_ti = MagicMock() | ||
| op._execute_context = {"ti": mock_ti} | ||
|
|
||
| assert op.dataflow_job_id is None | ||
|
|
||
| op.dataflow_job_id = sample_df_job_id | ||
| mock_ti.xcom_push.assert_called_once_with(key="dataflow_job_id", value=sample_df_job_id) | ||
| mock_ti.xcom_push.reset_mock() | ||
| op.dataflow_job_id = "sample_df_job_same_value_id" | ||
| mock_ti.xcom_push.assert_not_called() |
There was a problem hiding this comment.
Suggested change
| mock_ti = MagicMock() | |
| op._execute_context = {"ti": mock_ti} | |
| assert op.dataflow_job_id is None | |
| op.dataflow_job_id = sample_df_job_id | |
| mock_ti.xcom_push.assert_called_once_with(key="dataflow_job_id", value=sample_df_job_id) | |
| mock_ti.xcom_push.reset_mock() | |
| op.dataflow_job_id = "sample_df_job_same_value_id" | |
| mock_ti.xcom_push.assert_not_called() | |
| # Mock TaskInstance and inject into execution context | |
| mock_ti = MagicMock() | |
| op._execute_context = {"ti": mock_ti} | |
| assert op.dataflow_job_id is None | |
| op.dataflow_job_id = sample_df_job_id | |
| assert any( | |
| kwargs.get("key") == "dataflow_job_id" and kwargs.get("value") == sample_df_job_id | |
| for _, kwargs in mock_ti.xcom_push.call_args_list | |
| ) | |
| # If the same value is set again, it should not push to XCom again | |
| mock_ti.reset_mock() | |
| op.dataflow_job_id = sample_df_job_id | |
| assert mock_ti.xcom_push.call_count == 0 |
I have tested this code.
| __all__ = [ | ||
| "AIRFLOW_V_3_1_PLUS", | ||
| "BaseOperator", | ||
| ] |
There was a problem hiding this comment.
how about could add new line at end of file?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow-up of #52292. Part of #52378
^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named
{pr_number}.significant.rstor{issue_number}.significant.rst, in airflow-core/newsfragments.