Better result handling for recovery tests (#6826)

js/client/modules/@arangodb/testsuites/recovery.js

@@ -40,6 +40,7 @@ const toArgv = require('internal').toArgv;
 
 const RED = require('internal').COLORS.COLOR_RED;
 const RESET = require('internal').COLORS.COLOR_RESET;
+const BLUE = require('internal').COLORS.COLOR_BLUE;
 
 const testPaths = {
   'recovery': [tu.pathForTesting('server/recovery')]
@@ -50,6 +51,7 @@ const testPaths = {
 // //////////////////////////////////////////////////////////////////////////////
 
 function runArangodRecovery (instanceInfo, options, script, setup, count) {
+  let tmpDir;
   if (!instanceInfo.recoveryArgs) {
     let tempDir = fs.getTempPath();
     let td = fs.join(tempDir, `${count}`);
@@ -62,7 +64,7 @@ function runArangodRecovery (instanceInfo, options, script, setup, count) {
 
     let appDir = fs.join(td, 'app');
     fs.makeDirectoryRecursive(appDir);
-    let tmpDir = fs.join(td, 'tmp');
+    tmpDir = fs.join(td, 'tmp');
     fs.makeDirectoryRecursive(tmpDir);
 
     let args = pu.makeArgs.arangod(options, appDir, '', tmpDir);
@@ -102,6 +104,21 @@ function runArangodRecovery (instanceInfo, options, script, setup, count) {
   let binary = pu.ARANGOD_BIN;
 
   instanceInfo.pid = pu.executeAndWait(binary, argv, options, 'recovery', instanceInfo.rootDir, setup, !setup && options.coreCheck);
+  if (!setup) {
+    let jsonFN = fs.join(tmpDir, 'testresult.json');
+    try {
+      let result = JSON.parse(fs.read(jsonFN));
+      fs.remove(jsonFN);
+      return result;
+    } catch (x) {
+      print(RED + 'failed to read ' + jsonFN + RESET);
+      return {
+        status: false,
+        message: 'failed to read ' + jsonFN + x,
+        duration: -1
+      };
+    }
+  }
 }
 
 function recovery (options) {
@@ -139,17 +156,18 @@ function recovery (options) {
       let instanceInfo = {};
       count += 1;
 
+      print(BLUE + "running setup of " + test + RESET);
       runArangodRecovery(instanceInfo, localOptions, test, true, count);
 
-      runArangodRecovery(instanceInfo, localOptions, test, false, count);
+      print(BLUE + "running recovery of " + test + RESET);
-
+      results[test] = runArangodRecovery(instanceInfo, localOptions, test, false, count);
-      pu.cleanupLastDirectory(localOptions);
-
-      results[test] = instanceInfo.pid;
 
       if (!results[test].status) {
         status = false;
       }
+      else {
+        pu.cleanupLastDirectory(localOptions);
+      }
     } else {
       if (options.extremeVerbosity) {
         print('Skipped ' + test + ' because of ' + filtered.filter);
@@ -167,9 +185,7 @@ function recovery (options) {
   }
   results.status = status;
 
-  return {
+  return results;
-    recovery: results
-  };
 }
 
 exports.setup = function (testFns, defaultFns, opts, fnDocs, optionsDoc, allTestPaths) {

js/common/modules/jsunity.js

@@ -208,6 +208,17 @@ function Done (suiteName) {
   return ret;
 }
 
+// //////////////////////////////////////////////////////////////////////////////
+// / @brief done with all tests
+// //////////////////////////////////////////////////////////////////////////////
+
+function WriteDone (suiteName) {
+  var ret = Done(suiteName);
+  let outPath = fs.join(require("internal").options()['temp.path'], 'testresult.json');
+  fs.write(outPath, JSON.stringify(ret));
+  return ret;
+}
+
 // //////////////////////////////////////////////////////////////////////////////
 // / @brief runs a JSUnity test file
 // //////////////////////////////////////////////////////////////////////////////
@@ -238,4 +249,5 @@ exports.setTestFilter = setTestFilter;
 exports.jsUnity = jsUnity;
 exports.run = Run;
 exports.done = Done;
+exports.writeDone = WriteDone;
 exports.runTest = RunTest;

tests/js/server/recovery/applier-restart.js

@@ -77,6 +77,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/attributes.js

@@ -89,6 +89,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/big-transaction-durability.js

@@ -105,6 +105,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/collection-drop-recreate.js

@@ -105,6 +105,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/collection-duplicate-name.js

@@ -77,6 +77,6 @@ function main (argv) {
     return runSetup();
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done();
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/collection-duplicate.js

@@ -85,6 +85,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/collection-keygen-rocksdb.js

@@ -116,6 +116,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/collection-keygen.js

@@ -123,6 +123,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/collection-properties.js

@@ -129,6 +129,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/collection-recreate.js

@@ -96,6 +96,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/collection-rename-recreate-flush.js

@@ -113,6 +113,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/collection-rename-recreate.js

@@ -104,6 +104,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/collection-rename-with-data.js

@@ -91,6 +91,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/collection-rename.js

@@ -126,6 +126,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/collection-unload.js

@@ -88,6 +88,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/collections-different-attributes.js

@@ -101,6 +101,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/collections-reuse.js

@@ -126,6 +126,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/collector-oom.js

@@ -91,6 +91,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/corrupt-wal-marker-multiple.js

@@ -105,6 +105,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/corrupt-wal-marker-single-mmfiles.js

@@ -104,6 +104,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/corrupted-crc-mmfiles.js

@@ -92,6 +92,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/countermanager-delay-rocksdb.js

@@ -98,6 +98,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/countermanager-sync-rocksdb.js

@@ -92,6 +92,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/create-and-drop-databases.js

@@ -107,6 +107,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/create-collection-fail.js

@@ -104,6 +104,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/create-collection-tmpfile-mmfiles.js

@@ -100,6 +100,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/create-collections.js

@@ -178,6 +178,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/create-database-existing.js

@@ -91,6 +91,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/create-database-fail-mmfiles.js

@@ -103,6 +103,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/create-database-recovery.js

@@ -76,6 +76,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/create-databases.js

@@ -101,6 +101,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/create-indexes.js

@@ -115,6 +115,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/create-with-temp-mmfiles.js

@@ -86,6 +86,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/create-with-temp-old-mmfiles.js

@@ -86,6 +86,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/die-during-collector-mmfiles.js

@@ -111,6 +111,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/disk-full-datafile.js

@@ -92,6 +92,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/disk-full-logfile-data-mmfiles.js

@@ -92,6 +92,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/disk-full-logfile-mmfiles.js

@@ -90,6 +90,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/disk-full-no-collection-journal.js

@@ -112,6 +112,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/documents.js

@@ -76,6 +76,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/drop-collections.js

@@ -91,6 +91,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/drop-database-and-fail.js

@@ -99,6 +99,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/drop-database-flush-and-fail.js

@@ -93,6 +93,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/drop-database-only-tmp-mmfiles.js

@@ -85,6 +85,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/drop-databases.js

@@ -108,6 +108,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/drop-index-shutdown.js

@@ -78,6 +78,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/drop-index.js

@@ -82,6 +82,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/drop-indexes.js

@@ -104,6 +104,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/drop-single-collection.js

@@ -88,6 +88,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/edges.js

@@ -116,6 +116,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/empty-datafiles-mmfiles.js

@@ -62,6 +62,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/empty-logfiles-mmfiles.js

@@ -86,6 +86,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/flush-drop-database-and-fail.js

@@ -101,6 +101,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/foxx-directories.js

@@ -101,6 +101,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/indexes-after-flush.js

@@ -96,6 +96,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/indexes-geo-potslot.js

@@ -94,6 +94,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/indexes-geo.js

@@ -149,6 +149,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/indexes-hash.js

@@ -183,6 +183,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/indexes-persistent-nosync.js

@@ -97,6 +97,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/indexes-persistent-restore.js

@@ -92,6 +92,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/indexes-persistent.js

@@ -128,6 +128,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/indexes-skiplist.js

@@ -131,6 +131,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/indexes-sparse-hash.js

@@ -128,6 +128,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/indexes-sparse-skiplist.js

@@ -128,6 +128,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/indexes.js

@@ -129,6 +129,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/insert-update-remove-distance.js

@@ -114,6 +114,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/insert-update-remove.js

@@ -117,6 +117,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/insert-update-replace.js

@@ -94,6 +94,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/intermediate-commit-abort-rocksdb.js

@@ -86,6 +86,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/intermediate-commit-aql-insert-abort-rocksdb.js

@@ -86,6 +86,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/intermediate-commit-aql-insert-rocksdb.js

@@ -86,6 +86,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/intermediate-commit-aql-rocksdb.js

@@ -89,6 +89,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/intermediate-commit-aql-update-abort-rocksdb.js

@@ -91,6 +91,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/intermediate-commit-big-rocksdb.js

@@ -87,6 +87,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/intermediate-commit-rocksdb.js

@@ -82,6 +82,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/intermediate-commit-truncate-rocksdb.js

@@ -83,6 +83,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/intermediate-commits-babies-rocksdb.js

@@ -86,6 +86,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/leftover-collection-directory-mmfiles.js

@@ -95,6 +95,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/leftover-database-directory-mmfiles.js

@@ -102,6 +102,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/many-documents.js

@@ -75,6 +75,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/many-inserts.js

@@ -85,6 +85,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/many-logs.js

@@ -98,6 +98,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/many-updates.js

@@ -84,6 +84,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/multi-database-durability.js

@@ -122,6 +122,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/multiple-journals-2-mmfiles.js

@@ -116,6 +116,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/multiple-journals-3-mmfiles.js

@@ -163,6 +163,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/multiple-journals-mmfiles.js

@@ -113,6 +113,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/multiple-logs.js

@@ -91,6 +91,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/no-journal.js

@@ -90,6 +90,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/no-shutdown-info-multiple-logs.js

@@ -100,6 +100,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/no-shutdown-info-no-flush.js

@@ -110,6 +110,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/no-shutdown-info-with-flush.js

@@ -91,6 +91,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/nosync-rangedelete-collection-drop-indexes-rocksdb.js

@@ -92,6 +92,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/nosync-rangedelete-collection-drop-rocksdb.js

@@ -89,6 +89,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/nosync-rangedelete-truncate-indexes-rocksdb.js

@@ -101,6 +101,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/nosync-rangedelete-truncate-multi-rocksdb.js

@@ -101,6 +101,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/nosync-rangedelete-truncate-multi2-rocksdb.js

@@ -96,6 +96,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }

tests/js/server/recovery/nosync-rangedelete-truncate-multi3-rocksdb.js

@@ -95,6 +95,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }