Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel

UnitTests/unittest.js

@@ -73,13 +73,17 @@ function resultsToXml(results, baseName, cluster) {
     return (internalMembers.indexOf(b) === -1) && a.hasOwnProperty(b);
   };
 
-  for (let testrun in results) {
-    if (isSignificant(results, testrun)) {
-      for (let test in results[testrun]) {
-        let run = results[test];
+  for (let resultName in results) {
+    if (isSignificant(results, resultName)) {
+      let run = results[resultName];
 
-        if (isSignificant(run, test) && !run[test].hasOwnProperty('skipped')) {
-          const current = run[test];
+      for (let runName in run) {
+        if (isSignificant(run, runName)) {
+          const current = run[runName];
+
+          if (current.skipped) {
+            continue;
+          }
 
           let xml = buildXml();
           let failuresFound = "";
@@ -91,7 +95,7 @@ function resultsToXml(results, baseName, cluster) {
           xml.elem("testsuite", {
             errors: 0,
             failures: failuresFound,
-            name: clprefix + test,
+            name: clprefix + runName,
             tests: current.total,
             time: current.duration
           });
@@ -118,7 +122,7 @@ function resultsToXml(results, baseName, cluster) {
 
           if (!current.status) {
             xml.elem("testcase", {
-              name: 'all tests in ' + clprefix + test,
+              name: 'all tests in ' + clprefix + runName,
               time: current.duration
             }, false);
 
@@ -133,7 +137,7 @@ function resultsToXml(results, baseName, cluster) {
           xml.elem("/testsuite");
 
           const fn = makePathGeneric(baseName + clprefix +
-            testrun + '_' + test + ".xml").join('_');
+            resultName + '_' + runName + ".xml").join('_');
 
           fs.write("out/" + fn, xml.join(""));
         }

arangod/Cluster/RestShardHandler.h

@@ -36,7 +36,7 @@ class Dispatcher;
 /// @brief shard control request handler
 ////////////////////////////////////////////////////////////////////////////////
 
-class RestShardHandler : public admin::RestBaseHandler {
+class RestShardHandler : public RestBaseHandler {
  public:
   RestShardHandler(rest::HttpRequest* request, rest::Dispatcher*);
 

arangod/RestHandler/RestAdminLogHandler.cpp

@@ -32,7 +32,6 @@
 using namespace arangodb;
 using namespace arangodb::basics;
 using namespace arangodb::rest;
-using namespace arangodb::admin;
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief sort ascending

arangod/RestHandler/RestAdminLogHandler.h

@@ -28,7 +28,6 @@
 #include "RestHandler/RestBaseHandler.h"
 
 namespace arangodb {
-namespace admin {
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief admin log request handler
@@ -48,6 +47,5 @@ class RestAdminLogHandler : public RestBaseHandler {
   status_t execute() override;
 };
 }
-}
 
 #endif

arangod/RestHandler/RestBaseHandler.cpp

@@ -31,9 +31,9 @@
 #include <velocypack/Dumper.h>
 #include <velocypack/velocypack-aliases.h>
 
+using namespace arangodb;
 using namespace arangodb::basics;
 using namespace arangodb::rest;
-using namespace arangodb::admin;
 
 RestBaseHandler::RestBaseHandler(HttpRequest* request) : HttpHandler(request) {}
 

arangod/RestHandler/RestBaseHandler.h

@@ -36,7 +36,6 @@ namespace arangodb {
 namespace velocypack {
 class Slice;
 }
-namespace admin {
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief default handler for error handling and json in-/output
@@ -102,6 +101,5 @@ class RestBaseHandler : public rest::HttpHandler {
   virtual void generateOOMError();
 };
 }
-}
 
 #endif

arangod/RestHandler/RestDebugHandler.cpp

@@ -31,7 +31,6 @@ using namespace arangodb;
 
 using namespace arangodb::basics;
 using namespace arangodb::rest;
-using namespace arangodb::admin;
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief ArangoDB server

arangod/RestHandler/RestHandlerCreator.h

@@ -32,8 +32,6 @@ class HttpHandler;
 class HttpRequest;
 }
 
-namespace admin {
-
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief creator function
 ////////////////////////////////////////////////////////////////////////////////
@@ -67,6 +65,5 @@ class RestHandlerCreator : public H {
   }
 };
 }
-}
 
 #endif

arangod/RestHandler/RestJobHandler.cpp

@@ -32,7 +32,7 @@
 #include <velocypack/Builder.h>
 #include <velocypack/velocypack-aliases.h>
 
-using namespace arangodb::admin;
+using namespace arangodb;
 using namespace arangodb::basics;
 using namespace arangodb::rest;
 

arangod/RestHandler/RestJobHandler.h

@@ -34,8 +34,6 @@ class AsyncJobManager;
 class Dispatcher;
 }
 
-namespace admin {
-
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief job control request handler
 ////////////////////////////////////////////////////////////////////////////////
@@ -104,6 +102,5 @@ class RestJobHandler : public RestBaseHandler {
   rest::AsyncJobManager* _jobManager;
 };
 }
-}
 
 #endif

arangod/RestHandler/RestShutdownHandler.cpp

@@ -28,7 +28,7 @@
 #include <velocypack/Builder.h>
 #include <velocypack/velocypack-aliases.h>
 
-using namespace arangodb::admin;
+using namespace arangodb;
 using namespace arangodb::rest;
 
 RestShutdownHandler::RestShutdownHandler(arangodb::rest::HttpRequest* request,

arangod/RestHandler/RestShutdownHandler.h

@@ -30,7 +30,6 @@
 #include "RestHandler/RestBaseHandler.h"
 
 namespace arangodb {
-namespace admin {
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief shutdown request handler
@@ -57,6 +56,5 @@ class RestShutdownHandler : public RestBaseHandler {
   arangodb::rest::ApplicationServer* _applicationServer;
 };
 }
-}
 
 #endif

arangod/RestHandler/RestVersionHandler.cpp

@@ -34,7 +34,6 @@ using namespace arangodb;
 
 using namespace arangodb::basics;
 using namespace arangodb::rest;
-using namespace arangodb::admin;
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief ArangoDB server

arangod/RestHandler/RestVersionHandler.h

@@ -32,7 +32,7 @@ namespace arangodb {
 /// @brief version request handler
 ////////////////////////////////////////////////////////////////////////////////
 
-class RestVersionHandler : public arangodb::admin::RestBaseHandler {
+class RestVersionHandler : public arangodb::RestBaseHandler {
  public:
   explicit RestVersionHandler(arangodb::rest::HttpRequest*);
 

arangod/RestHandler/RestVocbaseBaseHandler.h

@@ -43,7 +43,7 @@ class VocbaseContext;
 /// @brief abstract base request handler
 ////////////////////////////////////////////////////////////////////////////////
 
-class RestVocbaseBaseHandler : public admin::RestBaseHandler {
+class RestVocbaseBaseHandler : public RestBaseHandler {
  private:
   RestVocbaseBaseHandler(RestVocbaseBaseHandler const&) = delete;
   RestVocbaseBaseHandler& operator=(RestVocbaseBaseHandler const&) = delete;

arangod/RestHandler/WorkMonitorHandler.cpp

@@ -36,8 +36,6 @@ WorkMonitorHandler::WorkMonitorHandler(HttpRequest* request)
 
 bool WorkMonitorHandler::isDirect() const { return true; }
 
-#include <iostream>
-
 HttpHandler::status_t WorkMonitorHandler::execute() {
   WorkMonitor::requestWorkOverview(_taskId);
   return status_t(HANDLER_ASYNC);

arangod/RestHandler/WorkMonitorHandler.h

@@ -31,7 +31,7 @@ namespace arangodb {
 /// @brief version request handler
 ////////////////////////////////////////////////////////////////////////////////
 
-class WorkMonitorHandler : public arangodb::admin::RestBaseHandler {
+class WorkMonitorHandler : public arangodb::RestBaseHandler {
  public:
   explicit WorkMonitorHandler(arangodb::rest::HttpRequest*);
 

arangod/RestServer/ArangoServer.cpp

@@ -92,7 +92,6 @@
 using namespace arangodb;
 using namespace arangodb::basics;
 using namespace arangodb::rest;
-using namespace arangodb::admin;
 
 bool ALLOW_USE_DATABASE_IN_REST_ACTIONS;
 
@@ -216,7 +215,7 @@ void ArangoServer::defineHandlers(HttpHandlerFactory* factory) {
   // And now some handlers which are registered in both /_api and /_admin
   factory->addPrefixHandler(
       "/_api/job",
-      RestHandlerCreator<arangodb::admin::RestJobHandler>::createData<
+      RestHandlerCreator<arangodb::RestJobHandler>::createData<
           std::pair<Dispatcher*, AsyncJobManager*>*>,
       _pairForJobHandler);
 
@@ -227,7 +226,7 @@ void ArangoServer::defineHandlers(HttpHandlerFactory* factory) {
   // And now the _admin handlers
   factory->addPrefixHandler(
       "/_admin/job",
-      RestHandlerCreator<arangodb::admin::RestJobHandler>::createData<
+      RestHandlerCreator<arangodb::RestJobHandler>::createData<
           std::pair<Dispatcher*, AsyncJobManager*>*>,
       _pairForJobHandler);
 
@@ -238,7 +237,7 @@ void ArangoServer::defineHandlers(HttpHandlerFactory* factory) {
   // further admin handlers
   factory->addHandler(
       "/_admin/log",
-      RestHandlerCreator<arangodb::admin::RestAdminLogHandler>::createNoData,
+      RestHandlerCreator<arangodb::RestAdminLogHandler>::createNoData,
       nullptr);
 
   factory->addHandler("/_admin/work-monitor",
@@ -254,7 +253,7 @@ void ArangoServer::defineHandlers(HttpHandlerFactory* factory) {
 
   factory->addPrefixHandler(
       "/_admin/shutdown",
-      RestHandlerCreator<arangodb::admin::RestShutdownHandler>::createData<
+      RestHandlerCreator<arangodb::RestShutdownHandler>::createData<
           void*>,
       static_cast<void*>(_applicationServer));
 }