Changeset 90884 in webkit

Timestamp:

Jul 12, 2011 9:05:51 PM (13 years ago)

Author:

abarth@webkit.org

Message:

Improve garden-o-matic UI when the bots fail to report revision numbers
​https://bugs.webkit.org/show_bug.cgi?id=64427

Reviewed by Dimitri Glazkov.

At least Win (dbg)(2) seems to fail to report the SVN revision number
in full_results.json. This patch makes garden-o-matic more robust to
missing revision numbers.

• Scripts/webkitpy/tool/servers/data/gardeningserver/main.js:
• Scripts/webkitpy/tool/servers/data/gardeningserver/results.js:
• Scripts/webkitpy/tool/servers/data/gardeningserver/results_unittests.js:
• Scripts/webkitpy/tool/servers/data/gardeningserver/ui.js:
• Scripts/webkitpy/tool/servers/data/gardeningserver/ui_unittests.js:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/servers/data/gardeningserver/main.js (modified) (1 diff)
• Scripts/webkitpy/tool/servers/data/gardeningserver/results.js (modified) (2 diffs)
• Scripts/webkitpy/tool/servers/data/gardeningserver/results_unittests.js (modified) (1 diff)
• Scripts/webkitpy/tool/servers/data/gardeningserver/ui.js (modified) (1 diff)
• Scripts/webkitpy/tool/servers/data/gardeningserver/ui_unittests.js (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-12  Adam Barth  <abarth@webkit.org>
+
+        Improve garden-o-matic UI when the bots fail to report revision numbers
+        https://bugs.webkit.org/show_bug.cgi?id=64427
+
+        Reviewed by Dimitri Glazkov.
+
+        At least Win (dbg)(2) seems to fail to report the SVN revision number
+        in full_results.json.  This patch makes garden-o-matic more robust to
+        missing revision numbers.
+
+        * Scripts/webkitpy/tool/servers/data/gardeningserver/main.js:
+        * Scripts/webkitpy/tool/servers/data/gardeningserver/results.js:
+        * Scripts/webkitpy/tool/servers/data/gardeningserver/results_unittests.js:
+        * Scripts/webkitpy/tool/servers/data/gardeningserver/ui.js:
+        * Scripts/webkitpy/tool/servers/data/gardeningserver/ui_unittests.js:
+
 2011-07-12  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/tool/servers/data/gardeningserver/main.js

@@ -31 +31 @@
                 results.unifyRegressionRanges(builderNameList, testName, function(oldestFailingRevision, newestPassingRevision) {
                     $('.regression-range', testSummary).append(ui.summarizeRegressionRange(oldestFailingRevision, newestPassingRevision));
+                    if (!newestPassingRevision)
+                        return;
                     checkout.existsAtRevision(checkout.subversionURLForTest(testName), newestPassingRevision, function(testExistedBeforeFailure) {
                         $(testSummary).attr('data-new-test', !testExistedBeforeFailure);

trunk/Tools/Scripts/webkitpy/tool/servers/data/gardeningserver/results.js

@@ -228 +228 @@
 
     walkHistory(builderName, testName, function(revision, resultNode) {
+        if (!revision) {
+            callback(oldestFailingRevision, newestPassingRevision);
+            return false;
+        }
         if (!resultNode) {
             newestPassingRevision = revision;
@@ -253 +257 @@
 
     $.each(regressionRanges, function(builderName, range) {
+        if (!range.oldestFailingRevision || !range.newestPassingRevision)
+            return
+
         if (!mergedRange.oldestFailingRevision)
             mergedRange.oldestFailingRevision = range.oldestFailingRevision;

trunk/Tools/Scripts/webkitpy/tool/servers/data/gardeningserver/results_unittests.js

@@ -255 +255 @@
 });
 
+test("walkHistory (no revision)", 3, function() {
+    var simulator = new NetworkSimulator();
+
+    var keyMap = {
+        "vsfdsfdsafsdafasd": {
+            "tests": {
+                "userscripts": {
+                    "another-test.html": {
+                        "expected": "PASS",
+                        "actual": "TEXT"
+                    }
+                },
+            },
+            "revision": ""
+        },
+        "gavsavsrfgwaevwefawvae":{
+            "tests": {
+            },
+            "revision": ""
+        },
+    };
+
+    simulator.jsonpHook = function(url, callback) {
+        simulator.scheduleCallback(function() {
+            if (/dir=1/.test(url)) {
+                callback([
+                    { "key": "vsfdsfdsafsdafasd" },
+                    { "key": "gavsavsrfgwaevwefawvae" },
+                ]);
+            } else {
+                var key = url.match(/key=([^&]+)/)[1];
+                callback(keyMap[key]);
+            }
+        });
+    };
+
+    simulator.runTest(function() {
+        results.regressionRangeForFailure("Mock Builder", "userscripts/another-test.html", function(oldestFailingRevision, newestPassingRevision) {
+            equals(oldestFailingRevision, 0);
+            equals(newestPassingRevision, 0);
+        });
+    });
+});
+
 test("collectUnexpectedResults", 1, function() {
     var dictionaryOfResultNodes = {

trunk/Tools/Scripts/webkitpy/tool/servers/data/gardeningserver/ui.js

@@ -51 +51 @@
 {
     if (!oldestFailingRevision || !newestPassingRevision)
-        return $();
+        return $('<div class="regression-range">Regression Range: Unknown</div>');
 
     var impliedFirstFailingRevision = newestPassingRevision + 1;

trunk/Tools/Scripts/webkitpy/tool/servers/data/gardeningserver/ui_unittests.js

@@ -31 +31 @@
 });
 
-test("summarizeRegressionRange", 2, function() {
+test("summarizeRegressionRange", 3, function() {
+    var summaryWithMultipleRevisions = ui.summarizeRegressionRange(0, 0);
+    summaryWithMultipleRevisions.wrap('<wrapper></wrapper>');
+    equal(summaryWithMultipleRevisions.parent().html(), '<div class="regression-range">Regression Range: Unknown</div>');
+
     var summaryWithMultipleRevisions = ui.summarizeRegressionRange(90424, 90426);
     summaryWithMultipleRevisions.wrap('<wrapper></wrapper>');