Fixes incorrect failure condition in activity processing in batch mode 82/169282/1
authorRadoslaw Cybulski <r.cybulski@partner.samsung.com>
Mon, 5 Feb 2018 11:20:36 +0000 (12:20 +0100)
committerRadoslaw Cybulski <r.cybulski@partner.samsung.com>
Mon, 5 Feb 2018 11:20:36 +0000 (12:20 +0100)
Fixes situation, where activity would be prematurely judged as failed.

Change-Id: I2acbd86856643b9f5bc7cede7ab75ae76fd02f73

src/batch/BatchRunner.cpp

index c0d47cd..b5e8408 100644 (file)
@@ -628,10 +628,10 @@ struct TestExecutor : ExecutorInterface {
                                                                auto h = monitor.lock();
                                                                h->setValue(true);
                                                        } });
-                                               if (!activity->isCompleted())
-                                                       throw EvaluationFailure{} << "not enough arguments for activity '" << activityName << "'";
                                                DEBUG("calling activity %s done", activityName.c_str());
                                        }, monitor);
+                                       if (!activity->isCompleted())
+                                               throw EvaluationFailure{} << "activity '" << activityName << "' is not marked as completed!";
                                        auto h = monitor.lock();
                                        ASSERT(*h); // sanity check, must be set, otherwise an exception was thrown
                                }