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

moved config file for testing to testing

This commit is contained in:
Frank Celler 2017-01-31 22:31:50 +01:00
parent c5f2f5e1e8
commit 73cf8e9e04
3 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
etc/testing/arango-dfdb.conf Normal file
View File

@ -0,0 +1,25 @@
[database]
auto-upgrade = false
upgrade-check = false
[server]
rest-server = false
authentication = false
# username = root
# password =
statistics = false
# set number of threads to 1 so we don't have concurrency
threads = 1
[javascript]
startup-directory = ./js
app-path = ./js/apps
script = ./js/server/arango-dfdb.js
v8-contexts = 1
[foxx]
queues = false
[log]
level = info

11
etc/testing/foxx-manager.conf Normal file
View File

@ -0,0 +1,11 @@
[console]
pretty-print = true
[server]
authentication = false
# username = root
# password =
[javascript]
startup-directory = ./js
execute-string = require("@arangodb/foxx/manager").run(ARGUMENTS);

10
js/client/modules/@arangodb/testing.js
View File

@ -2766,7 +2766,7 @@ testFuncs.config = function (options) {
testFuncs.dfdb = function (options) {
const dataDir = fs.getTempFile();
const args = ['-c', 'etc/relative/arango-dfdb.conf', dataDir];
const args = ['-c', 'etc/testing/arango-dfdb.conf', dataDir];
fs.makeDirectoryRecursive(dataDir);
let results = {};
@ -2971,12 +2971,12 @@ testFuncs.foxx_manager = function (options) {
let results = {};
results.update = runArangoshCmd(options, instanceInfo, {
'configuration': 'etc/relative/foxx-manager.conf'
'configuration': 'etc/testing/foxx-manager.conf'
}, ['update']);
if (results.update.status === true || options.force) {
results.search = runArangoshCmd(options, instanceInfo, {
'configuration': 'etc/relative/foxx-manager.conf'
'configuration': 'etc/testing/foxx-manager.conf'
}, ['search', 'itzpapalotl']);
}
@ -4378,7 +4378,7 @@ exports.unitTestPrettyPrintResults = unitTestPrettyPrintResults;
// }
// var results = {}
// results.install = runArangoshCmd(options, instanceInfo, {
// "configuration": "etc/relative/foxx-manager.conf"
// "configuration": "etc/testing/foxx-manager.conf"
// }, [
// "install",
// "js/common/test-data/apps/queue-legacy-test",
@ -4473,7 +4473,7 @@ exports.unitTestPrettyPrintResults = unitTestPrettyPrintResults;
// results.final.duration = time() - startTime
// results.uninstall = runArangoshCmd(options, instanceInfo, {
// "configuration": "etc/relative/foxx-manager.conf"
// "configuration": "etc/testing/foxx-manager.conf"
// }, [
// "uninstall",
// queueAppMountPath