You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2021/06/24 20:45:12 UTC
[GitHub] [airflow] ashb opened a new pull request #16642: Remove duplicated/overlapping tests around render_k8s_pod_yaml
ashb opened a new pull request #16642:
URL: https://github.com/apache/airflow/pull/16642
When making another change here, I noticed that we were basically
testing the same thing twice in test_taskinstance and
test_renderedtifields, which does no one any good.
I have updated the tests to use mocking to avoid duplication, and
exercised a few more of the branches in the functions under test
<!--
Thank you for contributing! Please make sure that your code changes
are covered with tests. And in case of new features or big changes
remember to adjust the documentation.
Feel free to ping committers for the review!
In case of existing issue, reference it using one of the following:
closes: #ISSUE
related: #ISSUE
How to write a good git commit message:
http://chris.beams.io/posts/git-commit/
-->
---
**^ Add meaningful description above**
Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/main/CONTRIBUTING.rst#pull-request-guidelines)** for more information.
In case of fundamental code change, Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvements+Proposals)) is needed.
In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
In case of backwards incompatible changes please leave a note in [UPDATING.md](https://github.com/apache/airflow/blob/main/UPDATING.md).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb commented on a change in pull request #16642: Remove duplicated/overlapping tests around render_k8s_pod_yaml
Posted by GitBox <gi...@apache.org>.
ashb commented on a change in pull request #16642:
URL: https://github.com/apache/airflow/pull/16642#discussion_r658272477
##########
File path: tests/models/test_renderedtifields.py
##########
@@ -248,71 +246,34 @@ def test_get_k8s_pod_yaml(self, mock_pod_mutation_hook, redact):
task = BashOperator(task_id="test", bash_command="echo hi")
ti = TI(task=task, execution_date=EXECUTION_DATE)
- rtif = RTIF(ti=ti)
- # Test that pod_mutation_hook is called
- mock_pod_mutation_hook.assert_called_once_with(mock.ANY)
+ render_k8s_pod_yaml = mock.patch.object(
+ ti, 'render_k8s_pod_yaml', return_value={"I'm a": "pod"}
+ ).start()
+
+ rtif = RTIF(ti=ti)
assert ti.dag_id == rtif.dag_id
assert ti.task_id == rtif.task_id
assert ti.execution_date == rtif.execution_date
- expected_pod_yaml = {
- 'metadata': {
- 'annotations': {
- 'dag_id': 'test_get_k8s_pod_yaml',
- 'execution_date': '2019-01-01T00:00:00+00:00',
- 'task_id': 'test',
- 'try_number': '1',
- },
- 'labels': {
- 'airflow-worker': 'worker-config',
- 'airflow_version': version,
- 'dag_id': 'test_get_k8s_pod_yaml',
- 'execution_date': '2019-01-01T00_00_00_plus_00_00',
- 'kubernetes_executor': 'True',
- 'task_id': 'test',
- 'try_number': '1',
- },
- 'name': mock.ANY,
- 'namespace': 'default',
- },
- 'spec': {
- 'containers': [
- {
- 'args': [
- 'airflow',
- 'tasks',
- 'run',
- 'test_get_k8s_pod_yaml',
- 'test',
- '2019-01-01T00:00:00+00:00',
- ],
- 'image': ':',
- 'name': 'base',
- 'env': [{'name': 'AIRFLOW_IS_K8S_EXECUTOR_POD', 'value': 'True'}],
- }
- ]
- },
- }
Review comment:
This is gone, as this is generated by code in TaskInstance so doesn't belong in a test in RTIF.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb commented on a change in pull request #16642: Remove duplicated/overlapping tests around render_k8s_pod_yaml
Posted by GitBox <gi...@apache.org>.
ashb commented on a change in pull request #16642:
URL: https://github.com/apache/airflow/pull/16642#discussion_r658272851
##########
File path: tests/models/test_renderedtifields.py
##########
@@ -248,71 +246,34 @@ def test_get_k8s_pod_yaml(self, mock_pod_mutation_hook, redact):
task = BashOperator(task_id="test", bash_command="echo hi")
ti = TI(task=task, execution_date=EXECUTION_DATE)
- rtif = RTIF(ti=ti)
- # Test that pod_mutation_hook is called
- mock_pod_mutation_hook.assert_called_once_with(mock.ANY)
Review comment:
Same here -- called (and now tested) from TaskInstance tests.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb merged pull request #16642: Remove duplicated/overlapping tests around render_k8s_pod_yaml
Posted by GitBox <gi...@apache.org>.
ashb merged pull request #16642:
URL: https://github.com/apache/airflow/pull/16642
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] github-actions[bot] commented on pull request #16642: Remove duplicated/overlapping tests around render_k8s_pod_yaml
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #16642:
URL: https://github.com/apache/airflow/pull/16642#issuecomment-867941276
The PR most likely needs to run full matrix of tests because it modifies parts of the core of Airflow. However, committers might decide to merge it quickly and take the risk. If they don't merge it quickly - please rebase it to the latest main at your convenience, or amend the last commit of the PR, and push it with --force-with-lease.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb commented on pull request #16642: Remove duplicated/overlapping tests around render_k8s_pod_yaml
Posted by GitBox <gi...@apache.org>.
ashb commented on pull request #16642:
URL: https://github.com/apache/airflow/pull/16642#issuecomment-868319489
Huh -- ended up with a bit of a "race" condition here. The build _started_ with just Py 3.6, and that was all that the Build Images flow built. But cos of the approval the Wait for Images is waiting on 3.7 and 3.8 too.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org