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

Provide ljson output for Foxx stream reporter

This commit is contained in:
Alan Plum 2017-03-15 19:39:11 +01:00
parent 4920ef8b41
commit c8d03dd4e1
No known key found for this signature in database
GPG Key ID: 8ED72A9A323B6EFD
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/apps/system/_api/foxx/APP/index.js
View File

@ -20,6 +20,8 @@ const router = createRouter();
module.context.registerType('multipart/form-data', require('./multipart')); module.context.registerType('multipart/form-data', require('./multipart'));
module.context.use(router); module.context.use(router);
const LDJSON = 'application/x-ldjson';
const legacyErrors = new Map([ const legacyErrors = new Map([
[errors.ERROR_SERVICE_INVALID_NAME.code, errors.ERROR_SERVICE_SOURCE_NOT_FOUND.code], [errors.ERROR_SERVICE_INVALID_NAME.code, errors.ERROR_SERVICE_SOURCE_NOT_FOUND.code],
[errors.ERROR_SERVICE_INVALID_MOUNT.code, errors.ERROR_INVALID_MOUNTPOINT.code], [errors.ERROR_SERVICE_INVALID_MOUNT.code, errors.ERROR_INVALID_MOUNTPOINT.code],
@ -385,7 +387,12 @@ instanceRouter.post('/tests', (req, res) => {
const service = req.service; const service = req.service;
const reporter = req.queryParams.reporter || null; const reporter = req.queryParams.reporter || null;
const result = fm.runTests(service.mount, {reporter}); const result = fm.runTests(service.mount, {reporter});
if (reporter === 'xunit' && req.accepts('xml', 'json') === 'xml') { if (reporter === 'stream' && req.accepts(LDJSON, 'json') === LDJSON) {
res.type(LDJSON);
for (const row of result) {
res.write(JSON.stringify(row) + '\r\n');
}
} else if (reporter === 'xunit' && req.accepts('xml', 'json') === 'xml') {
res.type('xml'); res.type('xml');
res.write('<?xml version="1.0" encoding="utf-8"?>\n'); res.write('<?xml version="1.0" encoding="utf-8"?>\n');
res.write(jsonml2xml(result) + '\n'); res.write(jsonml2xml(result) + '\n');
@ -399,7 +406,7 @@ instanceRouter.post('/tests', (req, res) => {
} }
}) })
.queryParam('reporter', joi.only(...reporters).optional(), `Test reporter to use`) .queryParam('reporter', joi.only(...reporters).optional(), `Test reporter to use`)
.response(200, ['json', 'xml', 'text'], `Test results.`) .response(200, ['json', LDJSON, 'xml', 'text'], `Test results.`)
.summary(`Run service tests`) .summary(`Run service tests`)
.description(dd` .description(dd`
Runs the tests for the service at the given mount path and returns the results. Runs the tests for the service at the given mount path and returns the results.