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

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

This commit is contained in:
James 2014-09-26 09:33:09 +01:00
parent 2070175a51 815e39cb58
commit 16edfa49ee
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/common/modules/reportgenerator.js
View File

@ -42,7 +42,7 @@ var generatePerfReportXML = function (reportName, testdata) {
var generatePerfReportGrinderCSV = function (reportName, testdata) { var generatePerfReportGrinderCSV = function (reportName, testdata) {
"use strict"; "use strict";
var x = "Thread, Run, Test, Start time (ms since Epoch), Test time, Errors, HTTP response code, HTTP response length, HTTP response errors, Time to resolve host, Time to establish connection, Time to first byte, New connections\n"; var x = "Thread, Run, Test, Start time (ms since Epoch), Test time, Errors, HTTP response code, HTTP response length, HTTP response errors, Time to resolve host, Time to establish connection, Time to first byte, New connections";
for (var testname in testdata) { for (var testname in testdata) {
@ -53,7 +53,7 @@ var generatePerfReportGrinderCSV = function (reportName, testdata) {
{ {
var s = testdata[testname][testCalculation].duration; var s = testdata[testname][testCalculation].duration;
if (!isNaN(s)) { if (!isNaN(s)) {
x = x + '0, 0, ' + testname + '/' + testCalculation + ',' + require("internal").time() + ', ' + s + ', 0, 0, 0, 0, 0, 0, 0, 0\n'; x = x + '\n0, 0, ' + testname + '/' + testCalculation + ',' + require("internal").time() + ', ' + s + ', 0, 0, 0, 0, 0, 0, 0, 0';
} }
} }
} }

2
scripts/unittest.js
View File

@ -1,4 +1,4 @@
var internalMembers = ["code", "error", "status", "duration", "failed", "total"]; var internalMembers = ["code", "error", "status", "duration", "failed", "total", "message"];
var fs = require("fs"); var fs = require("fs");
var print = require("internal").print; var print = require("internal").print;