Changeset 91478 in webkit


Ignore:
Timestamp:
Jul 21, 2011 10:25:41 AM (13 years ago)
Author:
abarth@webkit.org
Message:

garden-o-matic has trouble when the same test fails in different ways on diffrent bots
​https://bugs.webkit.org/show_bug.cgi?id=64830

Unreviewed. (Missing the patch is blocking me from fixing the tree.)

This patch is just some minor bug fixes. One of the bugs results from
the sadness of having two representations (a list and a space-separated
string) for the set of failure types.

  • 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:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r91448 r91478  
     12011-07-21  Adam Barth  <abarth@webkit.org>
     2
     3        garden-o-matic has trouble when the same test fails in different ways on diffrent bots
     4        https://bugs.webkit.org/show_bug.cgi?id=64830
     5
     6        Unreviewed.  (Missing the patch is blocking me from fixing the tree.)
     7
     8        This patch is just some minor bug fixes.  One of the bugs results from
     9        the sadness of having two representations (a list and a space-separated
     10        string) for the set of failure types.
     11
     12        * Scripts/webkitpy/tool/servers/data/gardeningserver/results.js:
     13        * Scripts/webkitpy/tool/servers/data/gardeningserver/results_unittests.js:
     14        * Scripts/webkitpy/tool/servers/data/gardeningserver/ui.js:
     15        * Scripts/webkitpy/tool/servers/data/gardeningserver/ui_unittests.js:
     16
    1172011-07-20  Ryosuke Niwa  <rniwa@webkit.org>
    218

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

    r91240 r91478  
    116116    });
    117117
    118     return suffixList;
     118    return base.uniquifyArray(suffixList);
    119119}
    120120

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

    r91042 r91478  
    124124    base.endsWith = realBase.endsWith;
    125125    base.trimExtension = realBase.trimExtension;
     126    base.uniquifyArray = realBase.uniquifyArray;
    126127    if (self.probeHook)
    127128        base.probe = self.probeHook;
    … …  
    344345});
    345346
    346 test("fetchResultsURLs", 4, function() {
     347test("fetchResultsURLs", 5, function() {
    347348    var simulator = new NetworkSimulator();
    348349
    … …  
    354355            if (base.endsWith(url, '.txt'))
    355356                options.success.call();
     357            else if (/taco.+png$/.test(url))
     358                options.success.call();
    356359            else
    357360                options.error.call();
    … …  
    368371            deepEqual(resultURLs, []);
    369372        });
     373        results.fetchResultsURLs("Mock Builder", "userscripts/taco.html", ['IMAGE', 'IMAGE+TEXT'], function(resultURLs) {
     374            deepEqual(resultURLs, [
     375                "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-expected.png",
     376                "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-actual.png",
     377                "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-diff.png",
     378                "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-diff.txt"
     379            ]);
     380        });
    370381    });
    371382
    … …  
    374385        "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/another-test-actual.png",
    375386        "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/another-test-diff.png",
    376         "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/another-test-crash-log.txt"
     387        "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/another-test-crash-log.txt",
     388        "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-expected.png",
     389        "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-actual.png",
     390        "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-diff.png",
     391        "http://build.chromium.org/f/chromium/layout_test_results/Mock_Builder/results/layout-test-results/userscripts/taco-diff.txt"
    377392    ]);
    378393});

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

    r91241 r91478  
    5454          '<td class="how-many"></td>' +
    5555        '</tr>');
    56     $('.test-name', block).text(testName).attr('href', ui.urlForTest(testName)).addClass(unexpectedResults.join(' '));
     56    var failureTypes = unexpectedResults.join(' ');
     57    $('.test-name', block).text(testName).attr('href', ui.urlForTest(testName)).addClass(failureTypes);
    5758    block.attr(config.kTestNameAttr, testName);
    58     block.attr(config.kFailureTypesAttr, unexpectedResults);
     59    block.attr(config.kFailureTypesAttr, failureTypes);
    5960
    6061    var where = $('.where', block);

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

    r91241 r91478  
    2929    ok(summaryHTML.indexOf('userscripts/another-test.html') != -1);
    3030    ok(summaryHTML.indexOf('Mock Builder') != -1);
     31});
     32
     33test("summarizeTest (data attributes)", 2, function() {
     34    var testName = 'userscripts/taco.html';
     35    var summary = ui.summarizeTest(testName, {
     36        "Mock Builder": {
     37            "expected": "PASS",
     38            "actual": "TEXT IMAGE+TEXT"
     39        }
     40    });
     41    equal(summary.attr(config.kTestNameAttr), "userscripts/taco.html");
     42    equal(summary.attr(config.kFailureTypesAttr), "TEXT IMAGE+TEXT");
    3143});
    3244
Note: See TracChangeset for help on using the changeset viewer.