omit default on inclusive gw with matched conditions

Author: essweine

SpiffWorkflow/bpmn/specs/mixins/inclusive_gateway.py

@@ -120,7 +120,9 @@ def check(spec):
 
     def _run_hook(self, my_task):
         outputs = self._get_matching_outputs(my_task)
-        if len(outputs) == 0:
+        defaults = self._get_default_outputs(my_task)
+        matches = [ts for ts in outputs if ts not in defaults]
+        if len(outputs) == 0 and len(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

@@ -111,6 +111,10 @@ def _get_matching_outputs(self, my_task):
                 outputs.append(my_task.workflow.spec.get_task_spec_from_name(output))
         return outputs
 
+    def _get_default_outputs(self, my_task):
+        defaults = [output for cond, output in self.cond_task_specs if cond is None]
+        return [my_task.workflow.spec.get_task_spec_from_name(output) for output in 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)

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})