Title: [90921] trunk/Tools
- Revision
- 90921
- Author
- [email protected]
- Date
- 2011-07-13 09:06:52 -0700 (Wed, 13 Jul 2011)
Log Message
Teach TestFailures to understand NRWT's output when it exits early due to too many failures
Fixes <http://webkit.org/b/64456> TestFailures page reports way too many failures when NRWT
exits early
Reviewed by Dimitri Glazkov.
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js:
(Builder.prototype.getNumberOfFailingTests): Relaxed the "Exiting early" test not to require
it to be at the beginning of the line, since NRWT prints a bunch of junk earlier in the
line. Tightened up the regex that's used to parse the number of failing tests to require the
leading number to be followed by whitespace so that we won't parse the "2011" in
"2011-07-13" as a number of failures.
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder_unittests.js:
Added a test for the above.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js (90920 => 90921)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js 2011-07-13 15:49:08 UTC (rev 90920)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js 2011-07-13 16:06:52 UTC (rev 90921)
@@ -135,11 +135,11 @@
return;
}
- if (/^Exiting early/.test(layoutTestStep.results[1][0]))
+ if (/Exiting early/.test(layoutTestStep.results[1][0]))
result.tooManyFailures = true;
result.failureCount = layoutTestStep.results[1].reduce(function(sum, outputLine) {
- var match = /^(\d+)/.exec(outputLine);
+ var match = /^(\d+)\s/.exec(outputLine);
if (!match)
return sum;
// Don't count leaks, new tests, or passes as failures.
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder_unittests.js (90920 => 90921)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder_unittests.js 2011-07-13 15:49:08 UTC (rev 90920)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder_unittests.js 2011-07-13 16:06:52 UTC (rev 90921)
@@ -115,4 +115,37 @@
});
});
+test("getNumberOfFailingTests understands NRWT exiting early due to too many failures", 4, function() {
+ const jsonData = {
+ steps: [
+ {
+ isFinished: true,
+ isStarted: true,
+ name: "layout-test",
+ results: [
+ 2,
+ [
+ "2011-07-13 04:38:46,315 11247 manager.py:780 WARNING Exiting early after 20 crashes and 0 timeouts. 2251 tests run.",
+ "20 failed"
+ ]
+ ],
+ step_number: 4,
+ text: [
+ "2011-07-13 04:38:46,315 11247 manager.py:780 WARNING Exiting early after 20 crashes and 0 timeouts. 2251 tests run.",
+ "20 failed"
+ ],
+ times: [
+ 1310557115.793082,
+ 1310557129.832104
+ ]
+ },
+ ],
+ };
+
+ runGetNumberOfFailingTestsTest(jsonData, function(failureCount, tooManyFailures) {
+ equal(failureCount, 20);
+ equal(tooManyFailures, true);
+ });
+});
+
})();
Modified: trunk/Tools/ChangeLog (90920 => 90921)
--- trunk/Tools/ChangeLog 2011-07-13 15:49:08 UTC (rev 90920)
+++ trunk/Tools/ChangeLog 2011-07-13 16:06:52 UTC (rev 90921)
@@ -1,3 +1,22 @@
+2011-07-13 Adam Roben <[email protected]>
+
+ Teach TestFailures to understand NRWT's output when it exits early due to too many failures
+
+ Fixes <http://webkit.org/b/64456> TestFailures page reports way too many failures when NRWT
+ exits early
+
+ Reviewed by Dimitri Glazkov.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js:
+ (Builder.prototype.getNumberOfFailingTests): Relaxed the "Exiting early" test not to require
+ it to be at the beginning of the line, since NRWT prints a bunch of junk earlier in the
+ line. Tightened up the regex that's used to parse the number of failing tests to require the
+ leading number to be followed by whitespace so that we won't parse the "2011" in
+ "2011-07-13" as a number of failures.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder_unittests.js:
+ Added a test for the above.
+
2011-07-12 Dimitri Glazkov <[email protected]>
Extract model-like TestExpectationLine and TestExpectationFile from TestExpectations.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
