69484 2011-10-05 17:26:20 -0700 watchlist: If the style check fails, then the watchlist will not be run. 2011-10-14 15:11:06 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 68822 1 levin levin abarth oldest_to_newest 478805 0 levin 2011-10-05 17:26:20 -0700 Right now, we run the watchlist after the stylebot (see http://trac.webkit.org/changeset/96541/trunk/Tools/Scripts/webkitpy/tool/commands/queues.py) but if the style bot fails, it will throw and the watchlist will not run. The ordering seems fine but we should consider doing something about not running watchlist. 478911 1 abarth 2011-10-05 20:29:50 -0700 We can just catch the exception and re-throw it. 484297 2 111078 levin 2011-10-14 14:29:01 -0700 Created attachment 111078 Patch 484323 3 111078 abarth 2011-10-14 14:52:16 -0700 Comment on attachment 111078 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=111078&action=review I like executive_throws_when_run. :) > Tools/Scripts/webkitpy/tool/commands/queues.py:440 > + # Raise any exceptions that occurred while running check-style > + if exception: > + raise exception There's a slightly snazzier way of doing using the "raise" keyword with no arguments, but this is more than fine. > Tools/Scripts/webkitpy/tool/mocktool.py:726 > - def __init__(self, should_log=False, should_throw=False): > + def __init__(self, should_log=False, should_throw=False, should_throw_when_run=set()): Eric will tell you to use Non for the default paramater value. The problem is that the default paramater value is a static and we modify it by accident, all future callers will get the modified value! > Tools/Scripts/webkitpy/tool/mocktool.py:729 > + self._should_throw_when_run = should_throw_when_run If you use None, then this line becomes: self._should_throw_when_run = should_throw_when_run or set() 484340 4 levin 2011-10-14 15:11:06 -0700 Committed as http://trac.webkit.org/changeset/97515 111078 2011-10-14 14:29:01 -0700 2011-10-14 14:52:16 -0700 Patch bug-69484-20111014142900.patch text/plain 6926 levin U3VidmVyc2lvbiBSZXZpc2lvbjogOTc0NzcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5NDA3NzY3MTViMTY2Njg4NTljNmY0ZjEzNDlkZDBiMjMy ZDFhNjNhLi5jYTllNjAzMjgwMDNkM2UyOTNmZmJkOWM2N2QzMGRmZDY5NTcxMzA2IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMTAtMTQgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAg ICAgIHdhdGNobGlzdDogSWYgdGhlIHN0eWxlIGNoZWNrIGZhaWxzLCB0aGVuIHRoZSB3YXRjaGxp c3Qgd2lsbCBub3QgYmUgcnVuLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Njk0ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHk6IFJ1 biB0aGUgd2F0Y2ggbGlzdCBldmVuCisgICAgICAgIGlmIHRoZSBzdHlsZSBwYXJ0IGZhaWxzIGFu ZCBkb24ndCBhbGxvdyB3YXRjaCBsaXN0IGZhaWx1cmVzIHR1cm4gdGhlCisgICAgICAgIGJvdCBy dW4gcmVkLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXNf dW5pdHRlc3QucHk6IEFwcHJvcHJpYXRlIHVuaXQgdGVzdHMuCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS90b29sL21vY2t0b29sLnB5OiBBZGQgc3VwcG9ydCB0byBtYWtlIGFuIGV4ZWN1dGl2 ZSBjb21tYW5kIHRocm93LgorCiAyMDExLTEwLTE0ICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxr dWJvQHByb2Z1c2lvbi5tb2JpPgogCiAgICAgICAgIFtFRkxdIENvcnJlY3RseSBnZXQgdGhlIGFi c29sdXRlIFVSTCBpbiBMYXlvdXRUZXN0Q29udHJvbGxlcjo6cXVldWVMb2FkKCkKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzLnB5CmluZGV4IGI2NGZmZjgw MDgxZDgwNWU5OWYxMDk2ZDU0OWI0OGE4MTVjNDY0YTYuLmVmYTNlNTRiNmRjZWNhNWFiYmFhYTg4 YzgzYzNjMDhlMjUzOTZjYjkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9jb21tYW5kcy9xdWV1ZXMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2Nv bW1hbmRzL3F1ZXVlcy5weQpAQCAtNDE5LDggKzQxOSwyNiBAQCBjbGFzcyBTdHlsZVF1ZXVlKEFi c3RyYWN0UmV2aWV3UXVldWUpOgogICAgICAgICByZXR1cm4gVHJ1ZQogCiAgICAgZGVmIHJldmll d19wYXRjaChzZWxmLCBwYXRjaCk6Ci0gICAgICAgIHNlbGYucnVuX3dlYmtpdF9wYXRjaChbImNo ZWNrLXN0eWxlIiwgIi0tZm9yY2UtY2xlYW4iLCAiLS1ub24taW50ZXJhY3RpdmUiLCAiLS1wYXJl bnQtY29tbWFuZD1zdHlsZS1xdWV1ZSIsIHBhdGNoLmlkKCldKQotICAgICAgICBzZWxmLnJ1bl93 ZWJraXRfcGF0Y2goWyJhcHBseS13YXRjaGxpc3QtbG9jYWwiLCBwYXRjaC5idWdfaWQoKV0pCisg ICAgICAgIGV4Y2VwdGlvbiA9IE5vbmUKKworICAgICAgICAjIFJ1biB0aGUgc3R5bGUgY2hlY2tz LgorICAgICAgICB0cnk6CisgICAgICAgICAgICBzZWxmLnJ1bl93ZWJraXRfcGF0Y2goWyJjaGVj ay1zdHlsZSIsICItLWZvcmNlLWNsZWFuIiwgIi0tbm9uLWludGVyYWN0aXZlIiwgIi0tcGFyZW50 LWNvbW1hbmQ9c3R5bGUtcXVldWUiLCBwYXRjaC5pZCgpXSkKKyAgICAgICAgZXhjZXB0IFNjcmlw dEVycm9yLCBlOgorICAgICAgICAgICAgIyBDYXB0dXJlIHRoZSBleGNlcHRpb24gZm9yIG5vdyB0 byBhbGxvdyB0aGUgd2F0Y2hsaXN0IHRvIGdldCBhcHBsaWVkLgorICAgICAgICAgICAgZXhjZXB0 aW9uID0gZQorCisgICAgICAgICMgQXBwbHkgdGhlIHdhdGNoIGxpc3QuCisgICAgICAgIHRyeToK KyAgICAgICAgICAgIHNlbGYucnVuX3dlYmtpdF9wYXRjaChbImFwcGx5LXdhdGNobGlzdC1sb2Nh bCIsIHBhdGNoLmJ1Z19pZCgpXSkKKyAgICAgICAgZXhjZXB0IFNjcmlwdEVycm9yLCBlOgorICAg ICAgICAgICAgIyBEb24ndCB0dXJuIHRoZSBzdHlsZSBib3QgYmxvY2sgcmVkIGR1ZSB0byB3YXRj aGxpc3QgaXNzdWVzLgorICAgICAgICAgICAgcGFzcworCisgICAgICAgICMgUmFpc2UgYW55IGV4 Y2VwdGlvbnMgdGhhdCBvY2N1cnJlZCB3aGlsZSBydW5uaW5nIGNoZWNrLXN0eWxlCisgICAgICAg IGlmIGV4Y2VwdGlvbjoKKyAgICAgICAgICAgIHJhaXNlIGV4Y2VwdGlvbgorCiAgICAgICAgIHJl dHVybiBUcnVlCiAKICAgICBAY2xhc3NtZXRob2QKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXNfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzX3VuaXR0ZXN0LnB5CmluZGV4IDZhYzFhN2Yx NWU1YjNlODljN2RlYzA0OGE2MDFjN2ZiMmVmODAzZDguLjA1ZWVlZGNmNjI0MDZiZDUzZDJmZTFi MTZkMmY3MzY3NTAyMDlhOTQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9jb21tYW5kcy9xdWV1ZXNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL3F1ZXVlc191bml0dGVzdC5weQpAQCAtNDQ2LDcgKzQ0NiwyNiBAQCBU aGUgY29tbWl0LXF1ZXVlIGlzIGNvbnRpbnVpbmcgdG8gcHJvY2VzcyB5b3VyIHBhdGNoLgogCiAK IGNsYXNzIFN0eWxlUXVldWVUZXN0KFF1ZXVlc1Rlc3QpOgotICAgIGRlZiB0ZXN0X3N0eWxlX3F1 ZXVlKHNlbGYpOgorICAgIGRlZiB0ZXN0X3N0eWxlX3F1ZXVlX3dpdGhfc3R5bGVfZXhjZXB0aW9u KHNlbGYpOgorICAgICAgICBleHBlY3RlZF9zdGRlcnIgPSB7CisgICAgICAgICAgICAiYmVnaW5f d29ya19xdWV1ZSI6IHNlbGYuX2RlZmF1bHRfYmVnaW5fd29ya19xdWV1ZV9zdGRlcnIoInN0eWxl LXF1ZXVlIiksCisgICAgICAgICAgICAibmV4dF93b3JrX2l0ZW0iOiAiIiwKKyAgICAgICAgICAg ICJzaG91bGRfcHJvY2VlZF93aXRoX3dvcmtfaXRlbSI6ICJNT0NLOiB1cGRhdGVfc3RhdHVzOiBz dHlsZS1xdWV1ZSBDaGVja2luZyBzdHlsZVxuIiwKKyAgICAgICAgICAgICJwcm9jZXNzX3dvcmtf aXRlbSI6ICIiIk1PQ0sgcnVuX2FuZF90aHJvd19pZl9mYWlsOiBbJ2VjaG8nLCAnLS1zdGF0dXMt aG9zdD1leGFtcGxlLmNvbScsICdjaGVjay1zdHlsZScsICctLWZvcmNlLWNsZWFuJywgJy0tbm9u LWludGVyYWN0aXZlJywgJy0tcGFyZW50LWNvbW1hbmQ9c3R5bGUtcXVldWUnLCAxMDAwMF0sIGN3 ZD0vbW9jay1jaGVja291dAorTU9DSyBydW5fYW5kX3Rocm93X2lmX2ZhaWw6IFsnZWNobycsICct LXN0YXR1cy1ob3N0PWV4YW1wbGUuY29tJywgJ2FwcGx5LXdhdGNobGlzdC1sb2NhbCcsIDUwMDAw XSwgY3dkPS9tb2NrLWNoZWNrb3V0CitNT0NLOiB1cGRhdGVfc3RhdHVzOiBzdHlsZS1xdWV1ZSBG YWlsCitNT0NLOiByZWxlYXNlX3dvcmtfaXRlbTogc3R5bGUtcXVldWUgMTAwMDBcbiIiIiwKKyAg ICAgICAgICAgICJoYW5kbGVfdW5leHBlY3RlZF9lcnJvciI6ICJNb2NrIGVycm9yIG1lc3NhZ2Vc biIsCisgICAgICAgICAgICAiaGFuZGxlX3NjcmlwdF9lcnJvciI6ICJNT0NLOiB1cGRhdGVfc3Rh dHVzOiBzdHlsZS1xdWV1ZSBTY3JpcHRFcnJvciBlcnJvciBtZXNzYWdlXG5NT0NLIGJ1ZyBjb21t ZW50OiBidWdfaWQ9NTAwMDAsIGNjPVtdXG4tLS0gQmVnaW4gY29tbWVudCAtLS1cbkF0dGFjaG1l bnQgMTAwMDAgZGlkIG5vdCBwYXNzIHN0eWxlLXF1ZXVlOlxuXG5TY3JpcHRFcnJvciBlcnJvciBt ZXNzYWdlXG5cbklmIGFueSBvZiB0aGVzZSBlcnJvcnMgYXJlIGZhbHNlIHBvc2l0aXZlcywgcGxl YXNlIGZpbGUgYSBidWcgYWdhaW5zdCBjaGVjay13ZWJraXQtc3R5bGUuXG4tLS0gRW5kIGNvbW1l bnQgLS0tXG5cbiIsCisgICAgICAgIH0KKyAgICAgICAgZXhwZWN0ZWRfZXhjZXB0aW9ucyA9IHsK KyAgICAgICAgICAgICJwcm9jZXNzX3dvcmtfaXRlbSI6IFNjcmlwdEVycm9yLAorICAgICAgICAg ICAgImhhbmRsZV9zY3JpcHRfZXJyb3IiOiBTeXN0ZW1FeGl0LAorICAgICAgICB9CisgICAgICAg IHRvb2wgPSBNb2NrVG9vbChsb2dfZXhlY3V0aXZlPVRydWUsIGV4ZWN1dGl2ZV90aHJvd3Nfd2hl bl9ydW49c2V0KFsnY2hlY2stc3R5bGUnXSkpCisgICAgICAgIHNlbGYuYXNzZXJ0X3F1ZXVlX291 dHB1dHMoU3R5bGVRdWV1ZSgpLCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyLCBleHBl Y3RlZF9leGNlcHRpb25zPWV4cGVjdGVkX2V4Y2VwdGlvbnMsIHRvb2w9dG9vbCkKKworICAgIGRl ZiB0ZXN0X3N0eWxlX3F1ZXVlX3dpdGhfd2F0Y2hfbGlzdF9leGNlcHRpb24oc2VsZik6CiAgICAg ICAgIGV4cGVjdGVkX3N0ZGVyciA9IHsKICAgICAgICAgICAgICJiZWdpbl93b3JrX3F1ZXVlIjog c2VsZi5fZGVmYXVsdF9iZWdpbl93b3JrX3F1ZXVlX3N0ZGVycigic3R5bGUtcXVldWUiKSwKICAg ICAgICAgICAgICJuZXh0X3dvcmtfaXRlbSI6ICIiLApAQCAtNDYxLDUgKzQ4MCw1IEBAIE1PQ0s6 IHJlbGVhc2Vfd29ya19pdGVtOiBzdHlsZS1xdWV1ZSAxMDAwMFxuIiIiLAogICAgICAgICBleHBl Y3RlZF9leGNlcHRpb25zID0gewogICAgICAgICAgICAgImhhbmRsZV9zY3JpcHRfZXJyb3IiOiBT eXN0ZW1FeGl0LAogICAgICAgICB9Ci0gICAgICAgIHRvb2wgPSBNb2NrVG9vbChsb2dfZXhlY3V0 aXZlPVRydWUpCisgICAgICAgIHRvb2wgPSBNb2NrVG9vbChsb2dfZXhlY3V0aXZlPVRydWUsIGV4 ZWN1dGl2ZV90aHJvd3Nfd2hlbl9ydW49c2V0KFsnYXBwbHktd2F0Y2hsaXN0LWxvY2FsJ10pKQog ICAgICAgICBzZWxmLmFzc2VydF9xdWV1ZV9vdXRwdXRzKFN0eWxlUXVldWUoKSwgZXhwZWN0ZWRf c3RkZXJyPWV4cGVjdGVkX3N0ZGVyciwgZXhwZWN0ZWRfZXhjZXB0aW9ucz1leHBlY3RlZF9leGNl cHRpb25zLCB0b29sPXRvb2wpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvbW9ja3Rvb2wucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHkK aW5kZXggNTQ3MWFmNTE4ODk0YjE5ZjZmNjBiNDY3YTRkMDllZDNkMWVmMGIzYS4uYWE0MjY4ZDRi MWViYjU2Y2VkZjNkY2M4NjMzZjkyZjc1OTgwY2VmNSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL21vY2t0b29sLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9tb2NrdG9vbC5weQpAQCAtNzIzLDkgKzcyMywxMCBAQCBjbGFzcyBNb2NrU3RhdHVzU2Vy dmVyKG9iamVjdCk6CiAKICMgRklYTUU6IFVuaWZ5IHdpdGggY29tbW9uLnN5c3RlbS5leGVjdXRp dmVfbW9jay5Nb2NrRXhlY3V0aXZlLgogY2xhc3MgTW9ja0V4ZWN1dGl2ZShvYmplY3QpOgotICAg IGRlZiBfX2luaXRfXyhzZWxmLCBzaG91bGRfbG9nPUZhbHNlLCBzaG91bGRfdGhyb3c9RmFsc2Up OgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBzaG91bGRfbG9nPUZhbHNlLCBzaG91bGRfdGhyb3c9 RmFsc2UsIHNob3VsZF90aHJvd193aGVuX3J1bj1zZXQoKSk6CiAgICAgICAgIHNlbGYuX3Nob3Vs ZF9sb2cgPSBzaG91bGRfbG9nCiAgICAgICAgIHNlbGYuX3Nob3VsZF90aHJvdyA9IHNob3VsZF90 aHJvdworICAgICAgICBzZWxmLl9zaG91bGRfdGhyb3dfd2hlbl9ydW4gPSBzaG91bGRfdGhyb3df d2hlbl9ydW4KICAgICAgICAgIyBGSVhNRTogT25jZSBleGVjdXRpdmUgd3JhcHMgb3MuZ2V0cGlk KCkgd2UgY2FuIGp1c3QgdXNlIGEgc3RhdGljIHBpZCBmb3IgInRoaXMiIHByb2Nlc3MuCiAgICAg ICAgIHNlbGYuX3J1bm5pbmdfcGlkcyA9IFtvcy5nZXRwaWQoKV0KIApAQCAtNzM1LDYgKzczNiw4 IEBAIGNsYXNzIE1vY2tFeGVjdXRpdmUob2JqZWN0KToKICAgICBkZWYgcnVuX2FuZF90aHJvd19p Zl9mYWlsKHNlbGYsIGFyZ3MsIHF1aWV0PUZhbHNlLCBjd2Q9Tm9uZSk6CiAgICAgICAgIGlmIHNl bGYuX3Nob3VsZF9sb2c6CiAgICAgICAgICAgICBsb2coIk1PQ0sgcnVuX2FuZF90aHJvd19pZl9m YWlsOiAlcywgY3dkPSVzIiAlIChhcmdzLCBjd2QpKQorICAgICAgICBpZiBzZWxmLl9zaG91bGRf dGhyb3dfd2hlbl9ydW4uaW50ZXJzZWN0aW9uKGFyZ3MpOgorICAgICAgICAgICAgcmFpc2UgU2Ny aXB0RXJyb3IoIkV4Y2VwdGlvbiBmb3IgJXMiICUgYXJncykKICAgICAgICAgcmV0dXJuICJNT0NL IG91dHB1dCBvZiBjaGlsZCBwcm9jZXNzIgogCiAgICAgZGVmIHJ1bl9jb21tYW5kKHNlbGYsCkBA IC04NDAsMTEgKzg0MywxMSBAQCBjbGFzcyBNb2NrV2ViKG9iamVjdCk6CiAKIAogY2xhc3MgTW9j a1Rvb2wob2JqZWN0KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgbG9nX2V4ZWN1dGl2ZT1GYWxz ZSk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGxvZ19leGVjdXRpdmU9RmFsc2UsIGV4ZWN1dGl2 ZV90aHJvd3Nfd2hlbl9ydW49c2V0KCkpOgogICAgICAgICBzZWxmLndha2V1cF9ldmVudCA9IHRo cmVhZGluZy5FdmVudCgpCiAgICAgICAgIHNlbGYuYnVncyA9IE1vY2tCdWd6aWxsYSgpCiAgICAg ICAgIHNlbGYuYnVpbGRib3QgPSBNb2NrQnVpbGRCb3QoKQotICAgICAgICBzZWxmLmV4ZWN1dGl2 ZSA9IE1vY2tFeGVjdXRpdmUoc2hvdWxkX2xvZz1sb2dfZXhlY3V0aXZlKQorICAgICAgICBzZWxm LmV4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUoc2hvdWxkX2xvZz1sb2dfZXhlY3V0aXZlLCBzaG91 bGRfdGhyb3dfd2hlbl9ydW49ZXhlY3V0aXZlX3Rocm93c193aGVuX3J1bikKICAgICAgICAgc2Vs Zi53ZWIgPSBNb2NrV2ViKCkKICAgICAgICAgc2VsZi53b3Jrc3BhY2UgPSBNb2NrV29ya3NwYWNl KCkKICAgICAgICAgc2VsZi5faXJjID0gTm9uZQo=