remove useless flush from test, bump wal flush default timeouts (arangodb#4845)

jsteemann · neunhoef · commit f1a2acebfb68 · 2018-03-14T21:59:48.000+01:00
diff --git a/arangod/MMFiles/MMFilesRestWalHandler.cpp b/arangod/MMFiles/MMFilesRestWalHandler.cpp
@@ -164,7 +164,7 @@ void MMFilesRestWalHandler::flush() {
   
   bool waitForSync = false;
   bool waitForCollector = false;
-  double maxWaitTime = 180.0;
+  double maxWaitTime = 300.0;
 
   if (slice.isObject()) {
     // got a request body
diff --git a/arangod/RocksDBEngine/RocksDBRestWalHandler.cpp b/arangod/RocksDBEngine/RocksDBRestWalHandler.cpp
@@ -103,7 +103,7 @@ void RocksDBRestWalHandler::flush() {
 
   bool waitForSync = false;
   bool waitForCollector = false;
-  double maxWaitTime = 60.0;
+  double maxWaitTime = 300.0;
 
   if (slice.isObject()) {
     // got a request body
diff --git a/js/common/tests/shell/shell-attributes.js b/js/common/tests/shell/shell-attributes.js
@@ -33,8 +33,6 @@ var jsunity = require("jsunity");
 var arangodb = require("@arangodb");
 
 var db = arangodb.db;
-var wait = require("internal").wait;
-
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief test attributes
@@ -65,7 +63,6 @@ function AttributesSuite () {
       c.unload();
       c.drop();
       c = null;
-      wait(0.0);
     },
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -452,11 +449,6 @@ function AttributesSuite () {
       assertEqual("\u0000test\u0000test", result[0].def);
       assertEqual("abc\u0000", result[0]["123"]);
 
-
-      // now shape documents
-      require("internal").wal.flush(true, true);
-      wait(3, false);
-      
       var d3 = c.document(d1._id);
 
       assertEqual("foo\u0001bar\u0000baz", d3.abc);
