Title: [91123] trunk/Tools
- Revision
- 91123
- Author
- [email protected]
- Date
- 2011-07-15 15:42:12 -0700 (Fri, 15 Jul 2011)
Log Message
Teach TestFailures how to detect interrupted build steps
Fixes <http://webkit.org/b/64619> TestFailures page thinks all tests passed in
http://build.webkit.org/builders/SnowLeopard%20Intel%20Release%20(WebKit2%20Tests)/builds/13401
Reviewed by Daniel Bates.
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js:
(Builder.prototype.getNumberOfFailingTests): If the build step has a result code of 4, the
build step was interrupted. Treat it as an error (by returning a failureCount of -1).
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder_unittests.js:
Added a test for the above.
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/LayoutTestResultsLoader.js:
(LayoutTestResultsLoader.prototype.start): Bumped the cache version to evict old, buggy
cache data that was afflicted by the above bug.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js (91122 => 91123)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js 2011-07-15 22:40:25 UTC (rev 91122)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js 2011-07-15 22:42:12 UTC (rev 91123)
@@ -135,6 +135,13 @@
return;
}
+ if (layoutTestStep.results[0] === 4) {
+ // This build step was interrupted (perhaps due to the build slave restarting).
+ PersistentCache.set(cacheKey, result);
+ callback(result.failureCount, result.tooManyFailures);
+ return;
+ }
+
if (/Exiting early/.test(layoutTestStep.results[1][0]))
result.tooManyFailures = true;
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder_unittests.js (91122 => 91123)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder_unittests.js 2011-07-15 22:40:25 UTC (rev 91122)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder_unittests.js 2011-07-15 22:42:12 UTC (rev 91123)
@@ -148,4 +148,36 @@
});
});
+test("getNumberOfFailingTests treats build step interruptions as errors", 4, function() {
+ const jsonData = {
+ steps: [
+ {
+ isFinished: true,
+ isStarted: true,
+ name: "layout-test",
+ results: [
+ 4,
+ [
+ "interrupted",
+ ]
+ ],
+ step_number: 5,
+ text: [
+ "layout-test",
+ "interrupted",
+ ],
+ times: [
+ 1310599204.1231229,
+ 1310600152.973659,
+ ]
+ },
+ ],
+ };
+
+ runGetNumberOfFailingTestsTest(jsonData, function(failureCount, tooManyFailures) {
+ equal(failureCount, -1);
+ equal(tooManyFailures, false);
+ });
+});
+
})();
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/LayoutTestResultsLoader.js (91122 => 91123)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/LayoutTestResultsLoader.js 2011-07-15 22:40:25 UTC (rev 91122)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/LayoutTestResultsLoader.js 2011-07-15 22:42:12 UTC (rev 91123)
@@ -30,7 +30,7 @@
LayoutTestResultsLoader.prototype = {
start: function(buildName, callback, errorCallback) {
var cacheKey = 'LayoutTestResultsLoader.' + this._builder.name + '.' + buildName;
- const currentCachedDataVersion = 5;
+ const currentCachedDataVersion = 6;
if (PersistentCache.contains(cacheKey)) {
var cachedData = PersistentCache.get(cacheKey);
if (cachedData.version === currentCachedDataVersion) {
Modified: trunk/Tools/ChangeLog (91122 => 91123)
--- trunk/Tools/ChangeLog 2011-07-15 22:40:25 UTC (rev 91122)
+++ trunk/Tools/ChangeLog 2011-07-15 22:42:12 UTC (rev 91123)
@@ -1,3 +1,23 @@
+2011-07-15 Adam Roben <[email protected]>
+
+ Teach TestFailures how to detect interrupted build steps
+
+ Fixes <http://webkit.org/b/64619> TestFailures page thinks all tests passed in
+ http://build.webkit.org/builders/SnowLeopard%20Intel%20Release%20(WebKit2%20Tests)/builds/13401
+
+ Reviewed by Daniel Bates.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js:
+ (Builder.prototype.getNumberOfFailingTests): If the build step has a result code of 4, the
+ build step was interrupted. Treat it as an error (by returning a failureCount of -1).
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder_unittests.js:
+ Added a test for the above.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/LayoutTestResultsLoader.js:
+ (LayoutTestResultsLoader.prototype.start): Bumped the cache version to evict old, buggy
+ cache data that was afflicted by the above bug.
+
2011-07-15 Eric Seidel <[email protected]>
new-run-webkit-tests crashes on Apple's Windows port when trying to launch Apache
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
