Changeset 93933 in webkit


Ignore:
Timestamp:
Aug 26, 2011 8:51:03 PM (13 years ago)
Author:
abarth@webkit.org
Message:

garden-o-matic should let me know that I need to run the local server
​https://bugs.webkit.org/show_bug.cgi?id=66985

Reviewed by Dimitri Glazkov.

The patch triggers an alert dialog whenever the user tries to use a
feature that requires the local server.

  • BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout.js:
  • BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js:
  • BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/summary.js:
Location:
trunk/Tools
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout.js

    r93840 r93933  
    3030var kWebKitTrunk = 'http://svn.webkit.org/repository/webkit/trunk/';
    3131
     32var g_unavailableCheckoutCallback = null;
     33var g_haveSeenCheckoutAvailable = false;
     34
     35function callIfCheckoutAvailable(callback)
     36{
     37    if (g_haveSeenCheckoutAvailable) {
     38        callback();
     39        return;
     40    }
     41    checkout.isAvailable(function(isAvailable) {
     42        if (isAvailable) {
     43            g_haveSeenCheckoutAvailable = true;
     44            callback();
     45            return;
     46        }
     47        if (g_unavailableCheckoutCallback)
     48            g_unavailableCheckoutCallback();
     49    });
     50}
     51
     52checkout.registerUnavailableCheckoutCallback = function(unavailableCheckoutCallback)
     53{
     54    g_unavailableCheckoutCallback = unavailableCheckoutCallback;
     55};
     56
    3257checkout.subversionURLForTest = function(testName)
    3358{
    … …  
    5075checkout.updateExpectations = function(failureInfoList, callback)
    5176{
    52     net.post(config.kLocalServerURL + '/updateexpectations', JSON.stringify(failureInfoList), function() {
    53         callback();
     77    callIfCheckoutAvailable(function() {
     78        net.post(config.kLocalServerURL + '/updateexpectations', JSON.stringify(failureInfoList), function() {
     79            callback();
     80        });
    5481    });
    5582};
    … …  
    5784checkout.optimizeBaselines = function(testName, callback)
    5885{
    59     net.post(config.kLocalServerURL + '/optimizebaselines?' + $.param({
    60         'test': testName,
    61     }), function() {
    62         callback();
     86    callIfCheckoutAvailable(function() {
     87        net.post(config.kLocalServerURL + '/optimizebaselines?' + $.param({
     88            'test': testName,
     89        }), function() {
     90            callback();
     91        });
    6392    });
    6493};
    … …  
    6695checkout.rollout = function(revision, reason, callback)
    6796{
    68     net.post(config.kLocalServerURL + '/rollout?' + $.param({
    69         'revision': revision,
    70         'reason': reason
    71     }), function() {
    72         callback();
     97    callIfCheckoutAvailable(function() {
     98        net.post(config.kLocalServerURL + '/rollout?' + $.param({
     99            'revision': revision,
     100            'reason': reason
     101        }), function() {
     102            callback();
     103        });
    73104    });
    74105};
    … …  
    76107checkout.rebaseline = function(failureInfoList, callback)
    77108{
    78     base.callInSequence(function(failureInfo, callback) {
    79         var extensionList = Array.prototype.concat.apply([], failureInfo.failureTypeList.map(results.failureTypeToExtensionList));
    80         base.callInSequence(function(extension, callback) {
    81             net.post(config.kLocalServerURL + '/rebaseline?' + $.param({
    82                 'builder': failureInfo.builderName,
    83                 'test': failureInfo.testName,
    84                 'extension': extension
    85             }), function() {
    86                 callback();
    87             });
    88         }, extensionList, callback);
    89     }, failureInfoList, function() {
    90         var testNameList = base.uniquifyArray(failureInfoList.map(function(failureInfo) { return failureInfo.testName; }));
    91         base.callInSequence(checkout.optimizeBaselines, testNameList, callback);
     109    callIfCheckoutAvailable(function() {
     110        base.callInSequence(function(failureInfo, callback) {
     111            var extensionList = Array.prototype.concat.apply([], failureInfo.failureTypeList.map(results.failureTypeToExtensionList));
     112            base.callInSequence(function(extension, callback) {
     113                net.post(config.kLocalServerURL + '/rebaseline?' + $.param({
     114                    'builder': failureInfo.builderName,
     115                    'test': failureInfo.testName,
     116                    'extension': extension
     117                }), function() {
     118                    callback();
     119                });
     120            }, extensionList, callback);
     121        }, failureInfoList, function() {
     122            var testNameList = base.uniquifyArray(failureInfoList.map(function(failureInfo) { return failureInfo.testName; }));
     123            base.callInSequence(checkout.optimizeBaselines, testNameList, callback);
     124        });
    92125    });
    93126};

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js

    r93259 r93933  
    3434test("updateExpectations", 4, function() {
    3535    var simulator = new NetworkSimulator();
     36
     37    // FIXME: This leaks state into g_haveSeenCheckoutAvailable, which is global.
     38    simulator.ajax = function(options) { options.success.call(); },
     39
    3640    simulator.post = function(url, data, callback)
    3741    {

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/summary.js

    r93607 r93933  
    5454    g_updateTimerId = window.setInterval(update, config.kUpdateFrequency);
    5555
     56    checkout.registerUnavailableCheckoutCallback(function() {
     57        alert('Please run "webkit-patch garden-o-matic" to enable this feature.');
     58    });
     59
    5660    var actions = new ui.notifications.Stream();
    5761    g_unexpectedFailures = new controllers.UnexpectedFailures(actions);

  • trunk/Tools/ChangeLog

    r93926 r93933  
     12011-08-26  Adam Barth  <abarth@webkit.org>
     2
     3        garden-o-matic should let me know that I need to run the local server
     4        https://bugs.webkit.org/show_bug.cgi?id=66985
     5
     6        Reviewed by Dimitri Glazkov.
     7
     8        The patch triggers an alert dialog whenever the user tries to use a
     9        feature that requires the local server.
     10
     11        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout.js:
     12        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js:
     13        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/summary.js:
     14
    1152011-08-26  Dimitri Glazkov  <dglazkov@chromium.org>
    216
Note: See TracChangeset for help on using the changeset viewer.