omit default on inclusive gw with matched conditions

SpiffWorkflow/bpmn/specs/mixins/inclusive_gateway.py

@@ -119,8 +119,8 @@ def check(spec):
         return complete
 
     def _run_hook(self, my_task):
-        outputs = self._get_matching_outputs(my_task)
-        if len(outputs) == 0:
+        matches, defaults = self._get_matching_outputs(my_task)
+        if len(matches + defaults) == 0:
             raise WorkflowTaskException('No conditions satisfied on gateway', task=my_task)
-        my_task._sync_children(outputs, TaskState.FUTURE)
+        my_task._sync_children(matches or defaults, TaskState.FUTURE)
         return True

SpiffWorkflow/specs/MultiChoice.py

@@ -103,17 +103,20 @@ def _predict_hook(self, my_task):
             my_task._add_child(spec, TaskState.MAYBE)
 
     def _get_matching_outputs(self, my_task):
-        outputs = []
+        matches, defaults = [], []
         for condition, output in self.cond_task_specs:
             if self.choice is not None and output not in self.choice:
                 continue
-            if condition is None or condition._matches(my_task):
-                outputs.append(my_task.workflow.spec.get_task_spec_from_name(output))
-        return outputs
+            if condition is None:
+                defaults.append(my_task.workflow.spec.get_task_spec_from_name(output))
+            elif condition._matches(my_task):
+                matches.append(my_task.workflow.spec.get_task_spec_from_name(output))
+        return matches, defaults
 
     def _run_hook(self, my_task):
         """Runs the task. Should not be called directly."""
-        my_task._sync_children(self._get_matching_outputs(my_task), TaskState.FUTURE)
+        matches, defaults = self._get_matching_outputs(my_task)
+        my_task._sync_children(matches + defaults, TaskState.FUTURE)
         for child in my_task.children:
             child.task_spec._predict(child, mask=TaskState.FUTURE|TaskState.PREDICTED_MASK)
         return True

tests/SpiffWorkflow/bpmn/InclusiveGatewayTest.py

@@ -32,6 +32,11 @@ def testNoPathFromSecondGateway(self):
 
     def testParallelCondition(self):
         self.set_data({'v': 0, 'u': 1, 'w': 1})
+        gw = self.workflow.get_next_task(state=TaskState.READY)
+        gw.run()
+        self.assertIsNone(self.workflow.get_next_task(spec_name='increment_v'))
+        self.assertTrue(self.workflow.get_next_task(spec_name='u_plus_v').state, TaskState.READY)
+        self.assertTrue(self.workflow.get_next_task(spec_name='w_plus_v').state, TaskState.READY)
         self.workflow.do_engine_steps()
         self.assertTrue(self.workflow.is_completed())
         self.assertDictEqual(self.workflow.data, {'v': 0, 'u': 1, 'w': 1})