Revision: a460c40d863d
Author: Mikko Korpela <[email protected]>
Date: Mon Jun 13 01:30:29 2011
Log: handle NOT_RUN state (dryrun) correctly in logs
http://code.google.com/p/robotframework/source/detail?r=a460c40d863d
Modified:
/src/robot/webcontent/model.js
/src/robot/webcontent/testdata.js
=======================================
--- /src/robot/webcontent/model.js Fri Jun 10 00:56:14 2011
+++ /src/robot/webcontent/model.js Mon Jun 13 01:30:29 2011
@@ -1,8 +1,9 @@
window.model = function () {
var STATUS = {
- pass:"pass",
- fail:"fail"
+ pass: "pass",
+ fail: "fail",
+ notRun: "not_run"
};
var KEYWORD_TYPE = {
@@ -28,8 +29,7 @@
suite.children = function () {
return
suite.keywords().concat(suite.tests()).concat(suite.suites());
};
- // TODO: Create message for suite here, not via a function
- // TODO: It seems failures in suite setup aren't handled at all
+ // TODO: Is hasTeardownFailure used anymore?
suite.hasTeardownFailure = function () {
return suiteTeardownFailed(suite) ||
data.status.parentSuiteTeardownFailed;
};
@@ -297,6 +297,7 @@
Times: Times,
PASS: STATUS.pass,
FAIL: STATUS.fail,
+ NOT_RUN: STATUS.notRun,
formatElapsed: formatElapsed,
containsTag: containsTag, // Exposed for tests
shortTime: shortTime
=======================================
--- /src/robot/webcontent/testdata.js Fri Jun 10 00:56:14 2011
+++ /src/robot/webcontent/testdata.js Mon Jun 13 01:30:29 2011
@@ -44,7 +44,7 @@
// TODO: Is separate status object needed? Probably not.
function createStatus(stats, parentSuiteTeardownFailed) {
- var status = (stats[0] == "P" ? model.PASS : model.FAIL);
+ var status = {'P': model.PASS , 'F': model.FAIL, 'N':
model.NOT_RUN}[stats[0]];
return model.Status(status, parentSuiteTeardownFailed);
}