From ba0d104edf8f6b1684d510ce1e94be17be5eec22 Mon Sep 17 00:00:00 2001
From: jsteemann <jan@arangodb.com>
Date: Wed, 25 May 2016 12:49:41 +0200
Subject: [PATCH] added tests

---
 arangod/VocBase/server.cpp                    |   6 +
 js/client/modules/@arangodb/testing.js        |   1 +
 .../recovery/create-database-existing.js      | 103 ++++++++++++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 js/server/tests/recovery/create-database-existing.js

diff --git a/arangod/VocBase/server.cpp b/arangod/VocBase/server.cpp
index bf870c3fe1..5499313336 100644
--- a/arangod/VocBase/server.cpp
+++ b/arangod/VocBase/server.cpp
@@ -444,6 +444,12 @@ static int OpenDatabases(TRI_server_t* server, bool isUpgrade) {
                << "' does not contain parameters file or parameters file "
                   "cannot be read";
 
+      if (TRI_FilesDirectory(parametersFile.c_str()).empty()) {
+        // directory is fully empty
+        LOG(WARN) << "ignoring empty database directory '" << databaseDirectory << "'";
+        continue;
+      }
+
       // abort
       res = TRI_ERROR_ARANGO_ILLEGAL_PARAMETER_FILE;
       break;
diff --git a/js/client/modules/@arangodb/testing.js b/js/client/modules/@arangodb/testing.js
index 0476cc7b52..ac9ca1f756 100644
--- a/js/client/modules/@arangodb/testing.js
+++ b/js/client/modules/@arangodb/testing.js
@@ -3031,6 +3031,7 @@ const recoveryTests = [
   "create-with-temp",
   "create-with-temp-old",
   "create-collection-fail",
+  "create-database-existing",
   "create-database-fail",
   "empty-datafiles",
   "flush-drop-database-and-fail",
diff --git a/js/server/tests/recovery/create-database-existing.js b/js/server/tests/recovery/create-database-existing.js
new file mode 100644
index 0000000000..463a8f615e
--- /dev/null
+++ b/js/server/tests/recovery/create-database-existing.js
@@ -0,0 +1,103 @@
+/*jshint globalstrict:false, strict:false, unused : false */
+/*global assertNotEqual, fail */
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief tests for dump/reload
+///
+/// @file
+///
+/// DISCLAIMER
+///
+/// Copyright 2010-2012 triagens GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is triAGENS GmbH, Cologne, Germany
+///
+/// @author Jan Steemann
+/// @author Copyright 2012, triAGENS GmbH, Cologne, Germany
+////////////////////////////////////////////////////////////////////////////////
+
+var db = require("@arangodb").db;
+var internal = require("internal");
+var jsunity = require("jsunity");
+var fs = require("fs");
+
+
+function runSetup () {
+  'use strict';
+  internal.debugClearFailAt();
+
+  try {
+    db._dropDatabase("UnitTestsRecovery");
+  } catch (err) {
+  }
+
+  db._createDatabase("UnitTestsRecovery");
+  db._useDatabase("UnitTestsRecovery");
+  var id = Number(db._id());
+  var path = db._path().replace(/-\d+$/, '');
+  db._useDatabase("_system");
+
+  // create some empty directories
+  for (var i = 1; i < 1000; ++i) {
+    try {
+      fs.makeDirectory(path + "-" + (id + i));
+    } catch (err) {
+    }
+  }
+  
+  internal.debugSegfault("crashing server");
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test suite
+////////////////////////////////////////////////////////////////////////////////
+
+function recoverySuite () {
+  'use strict';
+  jsunity.jsUnity.attachAssertions();
+
+  return {
+    setUp: function () {
+    },
+    tearDown: function () {
+    },
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test whether failures when creating databases causes issues
+////////////////////////////////////////////////////////////////////////////////
+    
+    testCreateDatabaseExisting : function () {
+      assertNotEqual(-1, db._databases().indexOf("UnitTestsRecovery")); 
+    }
+        
+  };
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief executes the test suite
+////////////////////////////////////////////////////////////////////////////////
+
+function main (argv) {
+  'use strict';
+  if (argv[1] === "setup") {
+    runSetup();
+    return 0;
+  }
+  else {
+    jsunity.run(recoverySuite);
+    return jsunity.done().status ? 0 : 1;
+  }
+}
+