From 2c8e9ba3a9135002e36847cf337b65ea0eb1fc53 Mon Sep 17 00:00:00 2001 From: Andreas Streichardt Date: Wed, 10 Aug 2016 17:23:00 +0200 Subject: [PATCH] Fix testing --- js/client/modules/@arangodb/testing.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/js/client/modules/@arangodb/testing.js b/js/client/modules/@arangodb/testing.js index c9d4546610..40286c3afa 100644 --- a/js/client/modules/@arangodb/testing.js +++ b/js/client/modules/@arangodb/testing.js @@ -649,9 +649,6 @@ function runThere (options, instanceInfo, file) { 'return runTest(' + JSON.stringify(file) + ', true);'; } - if (options.propagateInstanceInfo) { - } - let httpOptions = makeAuthorizationHeaders(options); httpOptions.method = 'POST'; httpOptions.timeout = 3600; @@ -3378,7 +3375,6 @@ testFuncs.replication_sync = function (options) { testFuncs.resilience = function (options) { findTests(); - options.propagateInstanceInfo = true; options.cluster = true; if (options.dbServers < 5) { options.dbServers = 5; @@ -3392,7 +3388,6 @@ testFuncs.resilience = function (options) { testFuncs.client_resilience = function (options) { findTests(); - options.propagateInstanceInfo = true; options.cluster = true; if (options.coordinators < 2) { options.coordinators = 2; @@ -3442,7 +3437,6 @@ testFuncs.server_http = function (options) { testFuncs.shell_server = function (options) { findTests(); - options.propagateInstanceInfo = true; return performTests(options, testsCases.server, 'shell_server', runThere); }; @@ -3764,10 +3758,18 @@ testFuncs.stress_locks = function (options) { testFuncs.agency = function (options) { findTests(); + let saveAgency = options.agency; + let saveCluster = options.cluster; + options.agency = true; options.cluster = false; - return performTests(options, testsCases.agency, 'agency', createArangoshRunner()); + let results = performTests(options, testsCases.agency, 'agency', createArangoshRunner()); + + options.agency = saveAgency; + options.cluster = saveCluster; + + return results; }; // //////////////////////////////////////////////////////////////////////////////