Fix AirflowSkipException message raised by BashOperator (#36354)

(cherry picked from commit 667a5b2)
apache · Jan 11, 2024 · d80d6a1 · d80d6a1
1 parent 3c70325
commit d80d6a1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/airflow/operators/bash.py b/airflow/operators/bash.py
@@ -162,7 +162,7 @@ def __init__(
             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.cwd = cwd
@@ -206,8 +206,8 @@ def execute(self, context: Context):
             output_encoding=self.output_encoding,
             cwd=self.cwd,
         )
-        if self.skip_on_exit_code is not None and result.exit_code in self.skip_on_exit_code:
-            raise AirflowSkipException(f"Bash command returned exit code {self.skip_on_exit_code}. Skipping.")
+        if result.exit_code in self.skip_on_exit_code:
+            raise AirflowSkipException(f"Bash command returned exit code {result.exit_code}. Skipping.")
         elif result.exit_code != 0:
             raise AirflowException(
                 f"Bash command failed. The command returned a non-zero exit code {result.exit_code}."

diff --git a/tests/operators/test_bash.py b/tests/operators/test_bash.py
@@ -169,15 +169,23 @@ def test_valid_cwd(self, tmp_path):
     @pytest.mark.parametrize(
         "extra_kwargs,actual_exit_code,expected_exc",
         [
-            (None, 99, AirflowSkipException),
-            ({"skip_on_exit_code": 100}, 100, AirflowSkipException),
-            ({"skip_on_exit_code": 100}, 101, AirflowException),
+            ({}, 0, None),
+            ({}, 100, AirflowException),
+            ({}, 99, AirflowSkipException),
+            ({"skip_on_exit_code": None}, 0, None),
+            ({"skip_on_exit_code": None}, 100, AirflowException),
             ({"skip_on_exit_code": None}, 99, AirflowException),
+            ({"skip_on_exit_code": 100}, 0, None),
+            ({"skip_on_exit_code": 100}, 100, AirflowSkipException),
+            ({"skip_on_exit_code": 100}, 99, 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, 102]}, 101, AirflowException),
-            ({"skip_on_exit_code": None}, 0, None),
+            ({"skip_on_exit_code": [100]}, 99, AirflowException),
+            ({"skip_on_exit_code": [100, 102]}, 99, AirflowException),
+            ({"skip_on_exit_code": (100,)}, 0, None),
+            ({"skip_on_exit_code": (100,)}, 100, AirflowSkipException),
+            ({"skip_on_exit_code": (100,)}, 99, AirflowException),
         ],
     )
     def test_skip(self, extra_kwargs, actual_exit_code, expected_exc):