fix handling of failed and skipped items

bundlewrap · Jan 5, 2015 · f08c9cc · f08c9cc
1 parent be78f64
commit f08c9cc
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/src/bundlewrap/itemqueue.py b/src/bundlewrap/itemqueue.py
@@ -69,6 +69,12 @@ def item_skipped(self, item):
                 if skipped_item.ITEM_TYPE_NAME == 'dummy':
                     continue
                 yield skipped_item
+        else:
+            self.items_with_deps = remove_dep_from_items(
+                self.items_with_deps,
+                item.id,
+            )
+            self._split()
 
     def pop(self, interactive=False):
         skipped_items = []

diff --git a/src/bundlewrap/node.py b/src/bundlewrap/node.py
@@ -143,13 +143,17 @@ def apply_items(node, workers=1, interactive=False, profiling=False):
                 status_code = msg['return_value']
 
                 if status_code == Item.STATUS_FAILED:
-                    item_queue.item_failed(item)
+                    for skipped_item in item_queue.item_failed(item):
+                        handle_apply_result(node, skipped_item, Item.STATUS_SKIPPED, interactive)
+                        yield(skipped_item.id, Item.STATUS_SKIPPED, timedelta(0))
                 elif status_code in (Item.STATUS_FIXED, Item.STATUS_ACTION_SUCCEEDED):
                     item_queue.item_fixed(item)
                 elif status_code == Item.STATUS_OK:
                     item_queue.item_ok(item)
                 elif status_code == Item.STATUS_SKIPPED:
-                    item_queue.item_skipped(item)
+                    for skipped_item in item_queue.item_skipped(item):
+                        handle_apply_result(node, skipped_item, Item.STATUS_SKIPPED, interactive)
+                        yield(skipped_item.id, Item.STATUS_SKIPPED, timedelta(0))
                 else:
                     raise AssertionError(_(
                         "unknown item status return for {item}: {status}".format(

diff --git a/tests/unit/itemqueue_tests.py b/tests/unit/itemqueue_tests.py
@@ -131,6 +131,22 @@ def test_item_skipped(self):
         with self.assertRaises(IndexError):
             iq.pop()
 
+    def test_item_skipped_no_cascade(self):
+        item1 = get_mock_item("type1", "name1", [], [])
+        item1.cascade_skip = False
+        item2 = get_mock_item("type1", "name2", [], ["type1:name1"])
+        iq = itemqueue.ItemQueue([item1, item2])
+        popped_item, skipped_items = iq.pop()
+        self.assertEqual(popped_item, item1)
+        self.assertEqual(skipped_items, [])
+        self.assertEqual(
+            list(iq.item_skipped(popped_item)),
+            [],
+        )
+        popped_item, skipped_items = iq.pop()
+        self.assertEqual(popped_item, item2)
+        self.assertEqual(skipped_items, [])
+
 
 class ItemQueuePopTest(TestCase):
     """