Changeset 91123 in webkit

Timestamp:

Jul 15, 2011 3:42:12 PM (13 years ago)

Author:

Adam Roben

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.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js (modified) (1 diff)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder_unittests.js (modified) (1 diff)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/LayoutTestResultsLoader.js (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js

@@ -136 +136 @@
             }
 
+            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;

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder_unittests.js

@@ -149 +149 @@
 });
 
+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);
+    });
+});
+
 })();

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/LayoutTestResultsLoader.js

@@ -31 +31 @@
     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);

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-15  Adam Roben  <aroben@apple.com>
+
+        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  <eric@webkit.org>