From f28d429bd5a2b52949becda961ea51ec0d0ee487 Mon Sep 17 00:00:00 2001
From: Andreas Streichardt <andreas@arangodb.com>
Date: Thu, 4 Aug 2016 13:33:12 +0200
Subject: [PATCH 1/2] fix ssl endpoint

---
 arangod/Cluster/AgencyComm.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arangod/Cluster/AgencyComm.cpp b/arangod/Cluster/AgencyComm.cpp
index 649b6c52f4..07d81b6578 100644
--- a/arangod/Cluster/AgencyComm.cpp
+++ b/arangod/Cluster/AgencyComm.cpp
@@ -1651,13 +1651,11 @@ AgencyCommResult AgencyComm::sendWithFailover(
       std::string endpoint;
 
       // transform location into an endpoint
-      int offset;
+      int offset { 11 };
       if (result.location().substr(0, 7) == "http://") {
         endpoint = "http+tcp://" + result.location().substr(7);
-        offset = 11;
       } else if (result.location().substr(0, 8) == "https://") {
-        endpoint = "ssl://" + result.location().substr(8);
-        offset = 6;
+        endpoint = "http+ssl://" + result.location().substr(8);
       } else {
         // invalid endpoint, return an error
         break;

From 9662d6cb7c08efc18c7446d865e067280e1e1605 Mon Sep 17 00:00:00 2001
From: Andreas Streichardt <andreas@arangodb.com>
Date: Fri, 5 Aug 2016 11:35:56 +0200
Subject: [PATCH 2/2] Fix strange naming

---
 js/client/modules/@arangodb/testing.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/js/client/modules/@arangodb/testing.js b/js/client/modules/@arangodb/testing.js
index f536cc6170..fd57ea0014 100644
--- a/js/client/modules/@arangodb/testing.js
+++ b/js/client/modules/@arangodb/testing.js
@@ -883,8 +883,8 @@ function runStressTest (options, command, testname) {
 // / @brief executes a command, possible with valgrind
 // //////////////////////////////////////////////////////////////////////////////
 
-function executeValgrind (cmd, args, options, valgrindTest) {
-  if (valgrindTest && options.valgrind) {
+function executeArangod (cmd, args, options) {
+  if (options.valgrind) {
     let valgrindOpts = {};
 
     if (options.valgrindArgs) {
@@ -1269,7 +1269,7 @@ function shutdownInstance (instanceInfo, options) {
 // //////////////////////////////////////////////////////////////////////////////
 
 function startInstanceCluster (instanceInfo, protocol, options,
-  addArgs, name, rootDir) {
+  addArgs, rootDir) {
   let makeArgs = function (name, args) {
     args = args || options.extraArgs;
 
@@ -1279,7 +1279,7 @@ function startInstanceCluster (instanceInfo, protocol, options,
     let subArgs = makeArgsArangod(options, fs.join(subDir, 'apps'));
     subArgs = Object.assign(subArgs, args);
 
-    return [subArgs, name, subDir];
+    return [subArgs, subDir];
   };
 
   options.agencySize = 1;
@@ -1342,7 +1342,7 @@ function startInstanceCluster (instanceInfo, protocol, options,
   return true;
 }
 
-function startArango (protocol, options, addArgs, name, rootDir, isAgency) {
+function startArango (protocol, options, addArgs, rootDir, isAgency) {
   const dataDir = fs.join(rootDir, 'data');
   const appDir = fs.join(rootDir, 'apps');
 
@@ -1389,7 +1389,7 @@ function startArango (protocol, options, addArgs, name, rootDir, isAgency) {
   }
 
   instanceInfo.url = endpointToURL(instanceInfo.endpoint);
-  instanceInfo.pid = executeValgrind(ARANGOD_BIN, toArgv(args), options, name).pid;
+  instanceInfo.pid = executeArangod(ARANGOD_BIN, toArgv(args), options).pid;
 
   if (platform.substr(0, 3) === 'win') {
     const procdumpArgs = [
@@ -1411,7 +1411,7 @@ function startArango (protocol, options, addArgs, name, rootDir, isAgency) {
 }
 
 function startInstanceAgency (instanceInfo, protocol, options,
-  addArgs, testname, rootDir) {
+  addArgs, rootDir) {
   const dataDir = fs.join(rootDir, 'data');
 
   const N = options.agencySize;
@@ -1446,7 +1446,7 @@ function startInstanceAgency (instanceInfo, protocol, options,
     let dir = fs.join(rootDir, 'agency-' + i);
     fs.makeDirectoryRecursive(dir);
 
-    instanceInfo.arangods.push(startArango(protocol, options, instanceArgs, testname, rootDir, true));
+    instanceInfo.arangods.push(startArango(protocol, options, instanceArgs, rootDir, true));
   }
 
   instanceInfo.endpoint = instanceInfo.arangods[instanceInfo.arangods.length - 1].endpoint;
@@ -1457,8 +1457,8 @@ function startInstanceAgency (instanceInfo, protocol, options,
 }
 
 function startInstanceSingleServer (instanceInfo, protocol, options,
-  addArgs, testname, rootDir) {
-  instanceInfo.arangods.push(startArango(protocol, options, addArgs, testname, rootDir, false));
+  addArgs, rootDir) {
+  instanceInfo.arangods.push(startArango(protocol, options, addArgs, rootDir, false));
 
   instanceInfo.endpoint = instanceInfo.arangods[instanceInfo.arangods.length - 1].endpoint;
   instanceInfo.url = instanceInfo.arangods[instanceInfo.arangods.length - 1].url;
@@ -1482,13 +1482,13 @@ function startInstance (protocol, options, addArgs, testname, tmpDir) {
     }
     else if (options.cluster) {
       startInstanceCluster(instanceInfo, protocol, options,
-        addArgs, testname, rootDir);
+        addArgs, rootDir);
     } else if (options.agency) {
       startInstanceAgency(instanceInfo, protocol, options,
-        addArgs, testname, rootDir);
+        addArgs, rootDir);
     } else {
       startInstanceSingleServer(instanceInfo, protocol, options,
-        addArgs, testname, rootDir);
+        addArgs, rootDir);
     }
 
     if (!options.cluster) {