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

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2014-09-24 17:33:24 +02:00
parent 792f5149dc 74f669118a
commit d499edbcec
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -387,11 +387,10 @@ function runThere (options, instanceInfo, file) {
if (!r.error && r.code === 200) { if (!r.error && r.code === 200) {
r = JSON.parse(r.body); r = JSON.parse(r.body);
} }
/* if (file.indexOf("-spec") !== -1) {
else { // remoting a jasmine suite...
print("Error on the remote arangod:\n" + r.body); r = {status: r, message: ''};
} }
*/
} }
catch (err) { catch (err) {
r = err; r = err;