Change status for failed graph in KeepGoing mode from ERROR to FAILED.

diff --git a/src/engine/ForEachLoop.cxx b/src/engine/ForEachLoop.cxx
index 431fee9f51eb8cc0b49d6bb6964a395135e8b9f4..6ca436fde1f4acde9a24de3af74dbcc32dfbf7f0 100644 (file)
--- a/src/engine/ForEachLoop.cxx
+++ b/src/engine/ForEachLoop.cxx
@@ -588,9 +588,11 @@ YACS::Event ForEachLoop::updateStateForWorkNodeOnFinishedEventFrom(Node *node, u
           try
           {
               if(_failedCounter!=0)
-                {
+                {// case of keepgoing mode + a failed
                   std::ostringstream oss; oss << "Keep Going mode activated and some errors (" << _failedCounter << ")reported !";
-                  throw YACS::Exception(oss.str());
+                  DEBTRACE("ForEachLoop::updateStateOnFinishedEventFrom : "<< oss.str());
+                  setState(YACS::FAILED);
+                  return YACS::ABORT;
                 }
               pushAllSequenceValues();
 

diff --git a/src/yacsloader_swig/Test/testSaveLoadRun.py b/src/yacsloader_swig/Test/testSaveLoadRun.py
index 9ae846bbda6cf124e3d5c6ba556b498e0f0d4c80..5433a4db95fe34685304ca7718af13c16e70002e 100755 (executable)
--- a/src/yacsloader_swig/Test/testSaveLoadRun.py
+++ b/src/yacsloader_swig/Test/testSaveLoadRun.py
@@ -741,7 +741,7 @@ else:
     ex.RunW(p,0)
     t0=datetime.now()-startt
     #
-    self.assertEqual(n1.getState(),pilot.ERROR)
+    self.assertEqual(n1.getState(),pilot.FAILED)
     n1.edGetSeqOfSamplesPort().getPyObj()
     a,b,c=n1.getPassedResults(ex)
     self.assertEqual(a,[0,1,2,4,5])
@@ -763,7 +763,7 @@ else:
     ex.RunW(p,0)
     t1=datetime.now()-startt
     #
-    self.assertEqual(n1.getState(),pilot.ERROR)
+    self.assertEqual(n1.getState(),pilot.FAILED)
     n1.edGetSeqOfSamplesPort().getPyObj()
     a,b,c=n1.getPassedResults(ex)
     self.assertEqual(a,[1,2,3,4,5])