merge with master

[platform/framework/web/wrt-plugins-common.git] / tests / dao / TestInit.cpp

diff --git a/tests/dao/TestInit.cpp b/tests/dao/TestInit.cpp
index 0474752..ddea164 100644 (file)
--- a/tests/dao/TestInit.cpp
+++ b/tests/dao/TestInit.cpp
@@ -30,14 +30,17 @@ int main (int argc, char *argv[])
 {
     int ret = system("/usr/bin/widgetdb_tests_prepare_db.sh start");
 
-    if (!WIFEXITED(ret)) {      //unexpected termiate
+    if (!WIFEXITED(ret)) {      //unexpected terminate
         LogDebug("Fail while preparing database. Restoring");
-        system("/usr/bin/widgetdb_tests_prepare_db.sh stop");
+        ret = system("/usr/bin/widgetdb_tests_prepare_db.sh stop");
+        if (ret != 0)
+            LogError("Finalization script has return error: " << ret);
+
         return -1;
     } else if (WEXITSTATUS(ret)) { //wrong script command, nothing done
-            LogError("Preparation script has return error: " << ret
-                     << ". Quitting");
-            return -1;
+        LogError("Preparation script has return error: " << ret
+                                                         << ". Quitting");
+        return -1;
     }
 
     LogInfo("Starting tests");
@@ -49,6 +52,11 @@ int main (int argc, char *argv[])
 
     WrtDB::WrtDatabase::detachFromThread();
 
-    system("/usr/bin/widgetdb_tests_prepare_db.sh stop");
+    ret = system("/usr/bin/widgetdb_tests_prepare_db.sh stop");
+    if (ret != 0) {
+        LogError("Finalization script has return error: " << ret);
+        return -1;
+    }
+
     return status;
 }