Merge branch 'devel' into schmutz-ng

arangod/Agency/Supervision.cpp

@@ -628,7 +628,7 @@ void Supervision::enforceReplication() {
       try {
         replicationFactor = col("replicationFactor").slice().getUInt();
       } catch (std::exception const& e) {
-        LOG_TOPIC(WARN, Logger::AGENCY)
+        LOG_TOPIC(DEBUG, Logger::AGENCY)
           << "no replicationFactor entry in " << col.toJson();
         continue;
       }

js/client/tests/agency/agency-test.js

@@ -639,33 +639,28 @@ function agencyTestSuite () {
       assertEqual(readAndCheck([["/"]]),
                   [{"\\":{"a":{"^&%^&$^&%$":{"b\\\n":{"b":{"c":4}}}}}}]);
     },
-
+    
     testKeysBeginningWithSameString: function() {
       var res = accessAgency("write",[[{"/bumms":{"op":"set","new":"fallera"}, "/bummsfallera": {"op":"set","new":"lalalala"}}]]);
       assertEqual(res.statusCode, 200);
       assertEqual(readAndCheck([["/bumms", "/bummsfallera"]]), [{bumms:"fallera", bummsfallera: "lalalala"}]);
-    }
-
-    /*
-      // Test babies
-     */
-
-    /*
+    },
+    
     testHiddenAgencyWrite: function() {
       var res = accessAgency("write",[[{".agency": {"op":"set","new":"fallera"}}]]);
-      assertEqual(res.statusCode, 400);
+      assertEqual(res.statusCode, 200);
     }, 
-
+    
     testHiddenAgencyWriteSlash: function() {
       var res = accessAgency("write",[[{"/.agency": {"op":"set","new":"fallera"}}]]);
-      assertEqual(res.statusCode, 400);
+      assertEqual(res.statusCode, 200);
     },
     
     testHiddenAgencyWriteDeep: function() {
       var res = accessAgency("write",[[{"/.agency/hans": {"op":"set","new":"fallera"}}]]);
-      assertEqual(res.statusCode, 400);
+      assertEqual(res.statusCode, 200);
     } 
-    */
+    
   };
 }
 

js/server/tests/resilience/moving-shards-cluster.js

@@ -71,7 +71,7 @@ function MovingShardsSuite () {
       var shards = Object.keys(cinfo.shards);
       var replFactor = cinfo.shards[shards[0]].length;
       var count = 0;
-      while (++count <= 120) {
+      while (++count <= 180) {
         var ccinfo = shards.map(
           s => global.ArangoClusterInfo.getCollectionInfoCurrent(
             database, c[i].name(), s)