Fix missing UNSET initialization and update baselines

amcmahon-rh · Mar 20, 2024 · 73fb072 · 73fb072
1 parent 6ca7d2e
commit 73fb072
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/pubtools/_pulp/step.py b/pubtools/_pulp/step.py
@@ -4,7 +4,7 @@
 from more_executors.futures import f_sequence, f_return
 
 LOG = logging.getLogger("pubtools.pulp")
-
+UNSET = object()
 
 class StepDecorator(object):
     """Implementation of PulpTask.step decorator. See that method for more info."""
@@ -31,7 +31,7 @@ def new_fn(instance, *args, **kwargs):
                     extra={"event": {"type": "%s-skip" % self.machine_name}},
                 )
                 return (
-                    self.skipped_value
+                    self._skipped_value
                     if self._skipped_value is not UNSET
                     else args[0] if args else None
                 )

diff --git a/tests/logs/clear_repo/test_clear_repo/test_clear_file_skip_publish.jsonl b/tests/logs/clear_repo/test_clear_repo/test_clear_file_skip_publish.jsonl
@@ -7,5 +7,4 @@
 {"event": {"type": "publish-skip"}}
 {"event": {"type": "flush-ud-cache-start"}}
 {"event": {"type": "flush-ud-cache-end"}}
-{"event": {"type": "flush-cdn-cache-start"}}
-{"event": {"type": "flush-cdn-cache-end"}}
+{"event": {"type": "flush-cdn-cache-skip"}}
diff --git a/tests/logs/clear_repo/test_clear_repo/test_clear_file_skip_publish.txt b/tests/logs/clear_repo/test_clear_repo/test_clear_file_skip_publish.txt
@@ -9,6 +9,4 @@
 [    INFO] Flush UD cache: started
 [    INFO] UD cache flush is not enabled.
 [    INFO] Flush UD cache: finished
-[    INFO] Flush CDN cache: started
-[    INFO] CDN cache flush is not enabled.
-[    INFO] Flush CDN cache: finished
+[    INFO] Flush CDN cache: skipped