Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow re-using tmpDir in unit tests.

This commit is contained in:
Alan Plum 2015-06-10 19:14:06 +02:00
parent c3aeb5519c
commit e79088c528
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/server/modules/org/arangodb/testing.js
View File

@ -273,13 +273,13 @@ function makeAuthorisationHeaders (options) {
options.password)}};
}
function startInstance (protocol, options, addArgs, testname) {
function startInstance (protocol, options, addArgs, testname, tmpDir) {
// protocol must be one of ["tcp", "ssl", "unix"]
var startTime = time();
var topDir = findTopDir();
var instanceInfo = {};
instanceInfo.topDir = topDir;
var tmpDataDir = fs.getTempFile();
var tmpDataDir = tmpDir || fs.getTempFile();
var appDir;
instanceInfo.flatTmpDataDir = tmpDataDir;
@ -705,7 +705,7 @@ function shutdownInstance (instanceInfo, options) {
}
}
cleanupDirectories = cleanupDirectories.concat([instanceInfo.tmpDataDir, instanceInfo.flatTmpDataDir]);
cleanupDirectories = cleanupDirectories.concat(instanceInfo.tmpDataDir, instanceInfo.flatTmpDataDir);
}
function checkBodyForJsonToParse(request) {
@ -717,13 +717,13 @@ function checkBodyForJsonToParse(request) {
function cleanupDBDirectories(options) {
if (options.cleanup) {
for (var i in cleanupDirectories) {
if (cleanupDirectories.hasOwnProperty(i)) {
fs.removeDirectoryRecursive(cleanupDirectories[i], true);
// print("deleted " + cleanupDirectories[i]);
while (cleanupDirectories.length) {
var cleanupDirectory = cleanupDirectories.shift();
// Avoid attempting to remove the same directory multiple times
if (cleanupDirectories.indexOf(cleanupDirectory) === -1) {
fs.removeDirectoryRecursive(cleanupDirectory, true);
}
}
cleanupDirectories = [];
}
}