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

fix windows path escaping in testcase (#6833)

This commit is contained in:
Wilfried Goesgens 2018-10-11 18:32:34 +02:00 committed by Jan
parent 9d2da2c22c
commit 01086a767a
1 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
tests/js/client/shell/shell-require-canceled.js
View File

@ -40,49 +40,51 @@ function RequireCanceledTestSuite() {
return { return {
setUp() { setUp() {
arango.POST_RAW("/_admin/execute", // When running with windows paths, we need to escape them:
"require('module').globalPaths.unshift(require('path').resolve('./" + pathForTesting('common/test-data/modules') + "'));", { let path = pathForTesting('common/test-data/modules').replace(/\\/g, '\\\\');
'x-arango-v8-context': 0 arango.POST_RAW("/_admin/execute",
}); "require('module').globalPaths.unshift(require('path').resolve('./" + path + "'));", {
}, 'x-arango-v8-context': 0
});
},
tearDown() { tearDown() {
arango.POST_RAW("/_admin/execute", arango.POST_RAW("/_admin/execute",
"require('module').globalPaths.splice(0,1);", { "require('module').globalPaths.splice(0,1);", {
'x-arango-v8-context': 0 'x-arango-v8-context': 0
}); });
}, },
testRequireJson() { testRequireJson() {
var internal = require("internal"); var internal = require("internal");
var a = arango.POST_RAW("/_admin/execute", var a = arango.POST_RAW("/_admin/execute",
'return Object.keys(require("a"));', { 'return Object.keys(require("a"));', {
'x-arango-async': "store", 'x-arango-async': "store",
'x-arango-v8-context': 0 'x-arango-v8-context': 0
}); });
internal.sleep(3); internal.sleep(3);
var id = a.headers['x-arango-async-id']; var id = a.headers['x-arango-async-id'];
arango.PUT_RAW("/_api/job/" + id + "/cancel", ''); arango.PUT_RAW("/_api/job/" + id + "/cancel", '');
var c = arango.POST_RAW("/_admin/execute?returnAsJSON=true", var c = arango.POST_RAW("/_admin/execute?returnAsJSON=true",
'return Object.keys(require("a"));', { 'return Object.keys(require("a"));', {
'x-arango-async': "false", 'x-arango-async': "false",
'x-arango-v8-context': 0 'x-arango-v8-context': 0
}); });
var d; var d;
try { try {
d = VPACK_TO_V8(c.body); d = VPACK_TO_V8(c.body);
} catch (err) { } catch (err) {
require("internal").print(c.body); require("internal").print(c.body);
throw err; throw err;
}
assertEqual(2, d.length);
} }
assertEqual(2, d.length);
}
}; };
} }