From ea040037cb2d46f3e700e8350dfc22f028e0392d Mon Sep 17 00:00:00 2001
From: Frank Celler <frank@arangodb.com>
Date: Thu, 4 Feb 2016 12:34:14 +0100
Subject: [PATCH] unified naming (all_ok, ok => status)

---
 UnitTests/unittest.js                  |  4 ++--
 js/client/modules/@arangodb/testing.js | 21 ++++++++-------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/UnitTests/unittest.js b/UnitTests/unittest.js
index 015c938dfd..00bd50d4e5 100644
--- a/UnitTests/unittest.js
+++ b/UnitTests/unittest.js
@@ -196,12 +196,12 @@ function main(argv) {
   }
 
   _.defaults(r, {
-    all_ok: false,
+    status: false,
     crashed: true
   });
 
   // whether or not there was an error 
-  fs.write("out/UNITTEST_RESULT_EXECUTIVE_SUMMARY.json", String(r.all_ok));
+  fs.write("out/UNITTEST_RESULT_EXECUTIVE_SUMMARY.json", String(r.status));
 
   if (options.writeXmlReport) {
     fs.write("out/UNITTEST_RESULT.json", inspect(r));
diff --git a/js/client/modules/@arangodb/testing.js b/js/client/modules/@arangodb/testing.js
index 4e29c4e1ef..232d766e76 100644
--- a/js/client/modules/@arangodb/testing.js
+++ b/js/client/modules/@arangodb/testing.js
@@ -1729,7 +1729,6 @@ const internalMembers = [
   "failed",
   "total",
   "crashed",
-  "all_ok",
   "ok",
   "message",
   "suiteName"
@@ -3020,9 +3019,9 @@ function unitTestPrettyPrintResults(r) {
       print(fail);
     }
 
-    print("Overall state: " + ((r.all_ok === true) ? "Success" : "Fail"));
+    print("Overall state: " + ((r.status === true) ? "Success" : "Fail"));
 
-    if (r.all_ok !== true) {
+    if (r.status !== true) {
       print("   Suites failed: " + testSuiteFail + " Tests Failed: " + testFail);
     }
 
@@ -3098,7 +3097,7 @@ function unitTest(which, options) {
 
     return {
       ok: false,
-      all_ok: false
+      status: false
     };
   }
 
@@ -3132,11 +3131,9 @@ function unitTest(which, options) {
       if (!ok) {
         allok = false;
       }
-
-      results.all_ok = allok;
     }
 
-    results.all_ok = allok;
+    results.status = allok;
     results.crashed = serverCrashed;
 
     if (allok) {
@@ -3166,8 +3163,7 @@ function unitTest(which, options) {
 
     print(line);
     return {
-      ok: false,
-      all_ok: false
+      status: false
     };
   }
 
@@ -3192,8 +3188,8 @@ function unitTest(which, options) {
       }
     }
 
-    thisReply.ok = ok;
-    results.all_ok = ok;
+    thisReply.status = ok;
+    results.status = ok;
     results.crashed = serverCrashed;
 
     if (allok) {
@@ -3212,8 +3208,7 @@ function unitTest(which, options) {
   }
 
   return {
-    ok: false,
-    all_ok: false
+    status: false
   };
 }