This is an automated email from the ASF dual-hosted git repository.
husseinawala pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new d039437fc2 Allow DockerOperator.skip_on_exit_code to be zero (#36360)
d039437fc2 is described below
commit d039437fc2c01ebdc93bcb409e0218997e3bfadd
Author: Maxim Martynov <[email protected]>
AuthorDate: Fri Dec 22 01:50:11 2023 +0300
Allow DockerOperator.skip_on_exit_code to be zero (#36360)
---
airflow/providers/docker/operators/docker.py | 2 +-
tests/providers/docker/decorators/test_docker.py | 23 +++++++++++++++-----
tests/providers/docker/operators/test_docker.py | 27 ++++++++++++++----------
3 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/airflow/providers/docker/operators/docker.py
b/airflow/providers/docker/operators/docker.py
index b60fd359e4..dcbb93748f 100644
--- a/airflow/providers/docker/operators/docker.py
+++ b/airflow/providers/docker/operators/docker.py
@@ -319,7 +319,7 @@ class DockerOperator(BaseOperator):
skip_on_exit_code
if isinstance(skip_on_exit_code, Container)
else [skip_on_exit_code]
- if skip_on_exit_code
+ if skip_on_exit_code is not None
else []
)
self.port_bindings = port_bindings or {}
diff --git a/tests/providers/docker/decorators/test_docker.py
b/tests/providers/docker/decorators/test_docker.py
index c70fd5a379..462d20c4b8 100644
--- a/tests/providers/docker/decorators/test_docker.py
+++ b/tests/providers/docker/decorators/test_docker.py
@@ -123,16 +123,29 @@ class TestDockerDecorator:
assert dag.task_ids[-1] == "do_run__20"
@pytest.mark.parametrize(
- "extra_kwargs, actual_exit_code, expected_state",
+ "kwargs, actual_exit_code, expected_state",
[
- (None, 99, TaskInstanceState.FAILED),
+ ({}, 0, TaskInstanceState.SUCCESS),
+ ({}, 100, TaskInstanceState.FAILED),
+ ({}, 101, TaskInstanceState.FAILED),
+ ({"skip_on_exit_code": None}, 0, TaskInstanceState.SUCCESS),
+ ({"skip_on_exit_code": None}, 100, TaskInstanceState.FAILED),
+ ({"skip_on_exit_code": None}, 101, TaskInstanceState.FAILED),
+ ({"skip_on_exit_code": 100}, 0, TaskInstanceState.SUCCESS),
({"skip_on_exit_code": 100}, 100, TaskInstanceState.SKIPPED),
({"skip_on_exit_code": 100}, 101, TaskInstanceState.FAILED),
- ({"skip_on_exit_code": None}, 0, TaskInstanceState.SUCCESS),
+ ({"skip_on_exit_code": 0}, 0, TaskInstanceState.SKIPPED),
+ ({"skip_on_exit_code": [100]}, 0, TaskInstanceState.SUCCESS),
+ ({"skip_on_exit_code": [100]}, 100, TaskInstanceState.SKIPPED),
+ ({"skip_on_exit_code": [100]}, 101, TaskInstanceState.FAILED),
+ ({"skip_on_exit_code": [100, 102]}, 101, TaskInstanceState.FAILED),
+ ({"skip_on_exit_code": (100,)}, 0, TaskInstanceState.SUCCESS),
+ ({"skip_on_exit_code": (100,)}, 100, TaskInstanceState.SKIPPED),
+ ({"skip_on_exit_code": (100,)}, 101, TaskInstanceState.FAILED),
],
)
- def test_skip_docker_operator(self, extra_kwargs, actual_exit_code,
expected_state, dag_maker):
- @task.docker(image="python:3.9-slim", auto_remove="force",
**(extra_kwargs or {}))
+ def test_skip_docker_operator(self, kwargs, actual_exit_code,
expected_state, dag_maker):
+ @task.docker(image="python:3.9-slim", auto_remove="force", **kwargs)
def f(exit_code):
raise SystemExit(exit_code)
diff --git a/tests/providers/docker/operators/test_docker.py
b/tests/providers/docker/operators/test_docker.py
index 5a89a9606a..e055c2625b 100644
--- a/tests/providers/docker/operators/test_docker.py
+++ b/tests/providers/docker/operators/test_docker.py
@@ -527,27 +527,32 @@ class TestDockerOperator:
print_exception_mock.assert_not_called()
@pytest.mark.parametrize(
- "extra_kwargs, actual_exit_code, expected_exc",
+ "kwargs, actual_exit_code, expected_exc",
[
- (None, 99, AirflowException),
+ ({}, 0, None),
+ ({}, 100, AirflowException),
+ ({}, 101, AirflowException),
+ ({"skip_on_exit_code": None}, 0, None),
+ ({"skip_on_exit_code": None}, 100, AirflowException),
+ ({"skip_on_exit_code": None}, 101, AirflowException),
+ ({"skip_on_exit_code": 100}, 0, None),
({"skip_on_exit_code": 100}, 100, AirflowSkipException),
({"skip_on_exit_code": 100}, 101, AirflowException),
- ({"skip_on_exit_code": None}, 100, AirflowException),
+ ({"skip_on_exit_code": 0}, 0, AirflowSkipException),
+ ({"skip_on_exit_code": [100]}, 0, None),
({"skip_on_exit_code": [100]}, 100, AirflowSkipException),
- ({"skip_on_exit_code": (100, 101)}, 100, AirflowSkipException),
- ({"skip_on_exit_code": 100}, 101, AirflowException),
+ ({"skip_on_exit_code": [100]}, 101, AirflowException),
({"skip_on_exit_code": [100, 102]}, 101, AirflowException),
- ({"skip_on_exit_code": None}, 0, None),
+ ({"skip_on_exit_code": (100,)}, 0, None),
+ ({"skip_on_exit_code": (100,)}, 100, AirflowSkipException),
+ ({"skip_on_exit_code": (100,)}, 101, AirflowException),
],
)
- def test_skip(self, extra_kwargs, actual_exit_code, expected_exc):
+ def test_skip(self, kwargs, actual_exit_code, expected_exc):
msg = {"StatusCode": actual_exit_code}
self.client_mock.wait.return_value = msg
- kwargs = dict(image="ubuntu", owner="unittest", task_id="unittest")
- if extra_kwargs:
- kwargs.update(**extra_kwargs)
- operator = DockerOperator(**kwargs)
+ operator = DockerOperator(image="ubuntu", owner="unittest",
task_id="unittest", **kwargs)
if expected_exc is None:
operator.execute({})
