arangodb
diff --git a/‎js/client/modules/@arangodb/testsuites/agency.js
Lines changed: 1 addition & 1 deletion b/‎js/client/modules/@arangodb/testsuites/agency.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎js/client/modules/@arangodb/testsuites/aql.js
Lines changed: 7 additions & 6 deletions b/‎js/client/modules/@arangodb/testsuites/aql.js
Lines changed: 7 additions & 6 deletions
diff --git a/‎js/client/modules/@arangodb/testsuites/audit.js
Lines changed: 7 additions & 6 deletions b/‎js/client/modules/@arangodb/testsuites/audit.js
Lines changed: 7 additions & 6 deletions
diff --git a/‎js/client/modules/@arangodb/testsuites/authentication.js
Lines changed: 10 additions & 10 deletions b/‎js/client/modules/@arangodb/testsuites/authentication.js
Lines changed: 10 additions & 10 deletions
@@ -50,7 +50,7 @@ function agency (options) {
 
   options.agency = true;
   options.cluster = false;
-  let results = tu.performTests(options, testCases, 'agency', tu.runInArangosh);
+  let results = new tu.runInArangoshRunner(options,  'agency', {}, false, false).run(testCases);
 
   options.agency = saveAgency;
   options.cluster = saveCluster;
 
@@ -87,10 +87,11 @@ function shellApiClient (options) {
   // we want this to ensure that in an overload situation we do not
   // get random failedLeader / failedFollower jobs during our tests.
   let moreOptions = { "agency.supervision-ok-threshold" : "15", "agency.supervision-grace-period" : "30" };
-  let rc = tu.performTests(opts, testCases, 'shell_api', tu.runInLocalArangosh, moreOptions);
+  let rc = new tu.runLocalInArangoshRunner(opts, 'shell_api', moreOptions).run(testCases);
   options.cleanup = options.cleanup && opts.cleanup;
   return rc;
 }
+
 // //////////////////////////////////////////////////////////////////////////////
 // / @brief TEST: shell_client
 // //////////////////////////////////////////////////////////////////////////////
@@ -108,7 +109,7 @@ function shellClient (options) {
   // we want this to ensure that in an overload situation we do not
   // get random failedLeader / failedFollower jobs during our tests.
   let moreOptions = { "agency.supervision-ok-threshold" : "15", "agency.supervision-grace-period" : "30" };
-  let rc = tu.performTests(opts, testCases, 'shell_client', tu.runInLocalArangosh, moreOptions);
+  let rc = new tu.runLocalInArangoshRunner(opts, 'shell_client', moreOptions).run(testCases);
   options.cleanup = options.cleanup && opts.cleanup;
   return rc;
 }
@@ -125,7 +126,7 @@ function shellServer (options) {
   testCases = tu.splitBuckets(options, testCases);
 
   let opts = ensureServers(options, 3);
-  let rc = tu.performTests(opts, testCases, 'shell_server', tu.runThere);
+  let rc = new tu.runOnArangodRunner(opts, 'shell_server', {}).run(testCases);
   options.cleanup = options.cleanup && opts.cleanup;
   return rc;
 }
@@ -140,7 +141,7 @@ function shellServerOnly (options) {
   testCases = tu.splitBuckets(options, testCases);
 
   let opts = ensureServers(options, 3);
-  let rc = tu.performTests(opts, testCases, 'shell_server_only', tu.runThere);
+  let rc = new tu.runOnArangodRunner(opts, 'shell_server_only', {}).run(testCases);
   options.cleanup = options.cleanup && opts.cleanup;
   return rc;
 }
@@ -164,7 +165,7 @@ function shellServerAql (options) {
     testCases = tu.splitBuckets(options, testCases);
 
     let opts = ensureServers(options, 3);
-    let rc = tu.performTests(opts, testCases, name, tu.runThere);
+    let rc = new tu.runOnArangodRunner(opts, name, {}).run(testCases);
     options.cleanup = options.cleanup && opts.cleanup;
     return rc;
   }
@@ -196,7 +197,7 @@ function shellClientAql (options) {
     testCases = tu.splitBuckets(options, testCases);
 
     let opts = ensureServers(options, 3);
-    let rc = tu.performTests(opts, testCases, name, tu.runInLocalArangosh);
+    let rc = new tu.runLocalInArangoshRunner(opts, name, {}).run(testCases);
     options.cleanup = options.cleanup && opts.cleanup;
     return rc;
   }
 
@@ -70,17 +70,18 @@ function auditLog(onServer) {
 
     options.auditLoggingEnabled = true;
 
-    const serverOptions = {
-      'server.authentication': 'true',
-      'server.jwt-secret': 'haxxmann',
+    const serverOptions = Object.assign({}, tu.testServerAuthInfo, {
       'log.level': 'audit-authentication=info',
       'log.force-direct': true
-    };
+    });
 
     print(CYAN + 'Audit log server tests...' + RESET);
     let testCases = tu.scanTestPaths(testPaths['audit_' + (onServer ? 'server' : 'client')], options);
-
-    return tu.performTests(options, testCases, 'audit', onServer ? tu.runThere : tu.runInArangosh, serverOptions);
+    if (onServer) {
+      return new tu.runOnArangodRunner(options, 'audit', serverOptions).run(testCases);
+    } else {
+      return new tu.runInArangoshRunner(options, 'audit', serverOptions).run(testCases);
+    }
   };
 }
 
 
@@ -74,11 +74,11 @@ function authenticationClient (options) {
 
   testCases = tu.splitBuckets(options, testCases);
 
-  return tu.performTests(options, testCases, 'authentication', tu.runInArangosh, {
-    'server.authentication': 'true',
-    'server.jwt-secret': 'haxxmann',
-    'cluster.create-waits-for-sync-replication': false
-  });
+  return new tu.runInArangoshRunner(options, 'authentication', Object.assign(
+    {},
+    tu.testServerAuthInfo, {
+      'cluster.create-waits-for-sync-replication': false
+    }), false).run(testCases);
 }
 
 function authenticationServer (options) {
@@ -97,11 +97,11 @@ function authenticationServer (options) {
   }
 
   print(CYAN + 'Server Authentication tests...' + RESET);
-  return tu.performTests(options, testCases, 'authentication_server', tu.runThere, {
-    'server.authentication': 'true',
-    'server.jwt-secret': 'haxxmann',
-    'cluster.create-waits-for-sync-replication': false
-  });
+  return new tu.runOnArangodRunner(options, 'authentication_server', Object.assign(
+    {},
+    tu.testServerAuthInfo, {
+      'cluster.create-waits-for-sync-replication': false
+    }), false).run(testCases);
 }
 
 // //////////////////////////////////////////////////////////////////////////////