76099 2012-01-11 13:26:57 -0800 test-webkitpy: fix -v and eliminate some spurious warnings 2012-01-11 13:58:09 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth aroben eric levin ojan webkit.review.bot oldest_to_newest 534204 0 dpranke 2012-01-11 13:26:57 -0800 test-webkitpy: fix -v and eliminate some spurious warnings 534207 1 122083 dpranke 2012-01-11 13:30:27 -0800 Created attachment 122083 Patch 534209 2 122083 dpranke 2012-01-11 13:32:48 -0800 Comment on attachment 122083 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=122083&action=review > Tools/Scripts/webkitpy/test/main.py:119 > + test_runner = unittest.TextTestRunner Yes, unittest.main() is actually this stupid and needs a class passed in for -v to work. 534221 3 dpranke 2012-01-11 13:42:32 -0800 Committed r104740: <http://trac.webkit.org/changeset/104740> 534233 4 122083 eric 2012-01-11 13:58:09 -0800 Comment on attachment 122083 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=122083&action=review OK. > Tools/Scripts/webkitpy/style/checkers/jsonchecker.py:47 > + self._handle_style_error(self.line_number_from_json_exception(e), 'json/syntax', 5, str(e)) unicode? > Tools/Scripts/webkitpy/style/checkers/jsonchecker.py:51 > + match = re.search(r': line (?P<line>\d+) column \d+', str(error)) unicode? 122083 2012-01-11 13:30:27 -0800 2012-01-11 13:58:09 -0800 Patch bug-76099-20120111133026.patch text/plain 6479 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NzI1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTc4NzFhZWQ4OGE4YjRhNjQyNDRiODYwZGVkNWI4ZGYy NGVjZjUzYy4uZTBiODBlNDZhMjhjNWE3ZDE0MTMyNTE5MjU2YzZmYTMzYTQ5NjA5YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMw IEBACiAyMDEyLTAxLTExICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHRlc3Qtd2Via2l0cHk6IGZpeCAtdiBhbmQgZWxpbWluYXRlIHNvbWUgc3B1cmlvdXMg d2FybmluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTc2MDk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg d2hlbiB3ZSBhZGRlZCBzdXBwb3J0IGZvciAtLXhtbCBvdXRwdXQsIHdlIGJyb2tlIHRoZSAtdiBm bGFnLgorCisgICAgICAgIEFsc28sIGZpeCB0aGUgY29kZSB0byBzd2FsbG93IGEgaGFybWxlc3Mg d2FybmluZyBmcm9tCisgICAgICAgIFZDU1V0aWxzLnBtIGFuZCBmaXggYSBkZXByZWNhdGVkIHdh cm5pbmcgaW4ganNvbmNoZWNrZXIucHkuCisKKyAgICAgICAgdGVzdC13ZWJraXRweSBpcyBub3cg c2lsZW50IGFnYWluIGV4Y2VwdCBmb3IgdGhlIG9uZSBrbm93bgorICAgICAgICBsb2dnaW5nIGlz c3VlLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hlY2tv dXQucHk6CisgICAgICAgIChDaGVja291dC5jb21taXRfbWVzc2FnZV9mb3JfdGhpc19jb21taXQp OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoZWNrb3V0X3Vu aXR0ZXN0LnB5OgorICAgICAgICAodGVzdF9jb21taXRfbWVzc2FnZV9mb3JfdGhpc19jb21taXQp OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvanNvbmNoZWNrZXIu cHk6CisgICAgICAgIChKU09OQ2hlY2tlci5jaGVjayk6CisgICAgICAgIChKU09OQ2hlY2tlci5s aW5lX251bWJlcl9mcm9tX2pzb25fZXhjZXB0aW9uKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L3Rlc3QvbWFpbi5weToKKyAgICAgICAgKFRlc3Rlci5ydW5fdGVzdHMpOgorCisyMDEyLTAx LTExICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIHdlYmtp dHB5OiBjbGVhbiB1cCB2ZXJzaW9uIGRldGVjdGlvbiBpbiB3ZWJraXRweS5sYXlvdXRfdGVzdHMu cG9ydAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzYw MTYKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQv Y2hlY2tvdXQucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGVj a291dC5weQppbmRleCAwOGFiZTZjZDg4Y2VhMjVmZDE0MDBjMGNlNTZhNGY5YjhhZjczYWU3Li45 M2EyMDVhZGFjMTZjNTA2NzQ1ZmI1MmZhNTAxNTNhMGRiMjQwNTEzIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGVja291dC5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGVja291dC5weQpAQCAtMSw5ICsx LDkgQEAKICMgQ29weXJpZ2h0IChjKSAyMDEwIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCi0jIAorIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5 IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQogIyBtZXQ6Ci0jIAorIwog IyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFi b3ZlIGNvcHlyaWdodAogIyBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIuCiAjICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkg Zm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKQEAgLTEzLDcgKzEzLDcgQEAKICMgICAgICog TmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0cwogIyBj b250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRl cml2ZWQgZnJvbQogIyB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRl biBwZXJtaXNzaW9uLgotIyAKKyMKICMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUg Q09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUwogIyAiQVMgSVMiIEFORCBBTlkgRVhQ UkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAogIyBMSU1JVEVE IFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVT UyBGT1IKQEAgLTEyMSwxMyArMTIxLDEzIEBAIGNsYXNzIENoZWNrb3V0KG9iamVjdCk6CiAgICAg ZGVmIG1vZGlmaWVkX25vbl9jaGFuZ2Vsb2dzKHNlbGYsIGdpdF9jb21taXQsIGNoYW5nZWRfZmls ZXM9Tm9uZSk6CiAgICAgICAgIHJldHVybiBzZWxmLl9tb2RpZmllZF9maWxlc19tYXRjaGluZ19w cmVkaWNhdGUoZ2l0X2NvbW1pdCwgbGFtYmRhIHBhdGg6IG5vdCBzZWxmLmlzX3BhdGhfdG9fY2hh bmdlbG9nKHBhdGgpLCBjaGFuZ2VkX2ZpbGVzPWNoYW5nZWRfZmlsZXMpCiAKLSAgICBkZWYgY29t bWl0X21lc3NhZ2VfZm9yX3RoaXNfY29tbWl0KHNlbGYsIGdpdF9jb21taXQsIGNoYW5nZWRfZmls ZXM9Tm9uZSk6CisgICAgZGVmIGNvbW1pdF9tZXNzYWdlX2Zvcl90aGlzX2NvbW1pdChzZWxmLCBn aXRfY29tbWl0LCBjaGFuZ2VkX2ZpbGVzPU5vbmUsIHJldHVybl9zdGRlcnI9RmFsc2UpOgogICAg ICAgICBjaGFuZ2Vsb2dfcGF0aHMgPSBzZWxmLm1vZGlmaWVkX2NoYW5nZWxvZ3MoZ2l0X2NvbW1p dCwgY2hhbmdlZF9maWxlcykKICAgICAgICAgaWYgbm90IGxlbihjaGFuZ2Vsb2dfcGF0aHMpOgog ICAgICAgICAgICAgcmFpc2UgU2NyaXB0RXJyb3IobWVzc2FnZT0iRm91bmQgbm8gbW9kaWZpZWQg Q2hhbmdlTG9ncywgY2Fubm90IGNyZWF0ZSBhIGNvbW1pdCBtZXNzYWdlLlxuIgogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIkFsbCBjaGFuZ2VzIHJlcXVpcmUgYSBDaGFuZ2VMb2cuICBT ZWU6XG4gJXMiICUgdXJscy5jb250cmlidXRpb25fZ3VpZGVsaW5lcykKIAotICAgICAgICBtZXNz YWdlX3RleHQgPSBzZWxmLl9zY20ucnVuKFtzZWxmLl9zY20uc2NyaXB0X3BhdGgoJ2NvbW1pdC1s b2ctZWRpdG9yJyksICctLXByaW50LWxvZyddICsgY2hhbmdlbG9nX3BhdGhzLCByZXR1cm5fc3Rk ZXJyPUZhbHNlKQorICAgICAgICBtZXNzYWdlX3RleHQgPSBzZWxmLl9zY20ucnVuKFtzZWxmLl9z Y20uc2NyaXB0X3BhdGgoJ2NvbW1pdC1sb2ctZWRpdG9yJyksICctLXByaW50LWxvZyddICsgY2hh bmdlbG9nX3BhdGhzLCByZXR1cm5fc3RkZXJyPXJldHVybl9zdGRlcnIpCiAgICAgICAgIHJldHVy biBDb21taXRNZXNzYWdlKG1lc3NhZ2VfdGV4dC5zcGxpdGxpbmVzKCkpCiAKICAgICBkZWYgcmVj ZW50X2NvbW1pdF9pbmZvc19mb3JfZmlsZXMoc2VsZiwgcGF0aHMpOgpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hlY2tvdXRfdW5pdHRlc3QucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGVja291dF91bml0dGVz dC5weQppbmRleCA5NjIzNjRiNmM3YWNkYTMyNjBkYjcwNzU0OGUxZGI3MDliMjc0MmMwLi43YTRi NDU0NWRiZDMzNGUwNmEyODFkYzBkMDU4OTU1MjEzMzhkZGYwIDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGVja291dF91bml0dGVzdC5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGVja291dF91bml0dGVz dC5weQpAQCAtMTM5LDcgKzEzOSw5IEBAIFNlY29uZCBwYXJ0IG9mIHRoaXMgY29tcGxpY2F0ZWQg Y2hhbmdlIGJ5IG1lLCBUb3IgQXJuZSBWZXN0Ylx1MDBmOCEKIAogICAgICAgICBjaGVja291dCA9 IENoZWNrb3V0KG1vY2tfc2NtKQogICAgICAgICBjaGVja291dC5tb2RpZmllZF9jaGFuZ2Vsb2dz ID0gbGFtYmRhIGdpdF9jb21taXQsIGNoYW5nZWRfZmlsZXM9Tm9uZTogc2VsZi5jaGFuZ2Vsb2dz Ci0gICAgICAgIGNvbW1pdF9tZXNzYWdlID0gY2hlY2tvdXQuY29tbWl0X21lc3NhZ2VfZm9yX3Ro aXNfY29tbWl0KGdpdF9jb21taXQ9Tm9uZSkKKyAgICAgICAgY29tbWl0X21lc3NhZ2UgPSBjaGVj a291dC5jb21taXRfbWVzc2FnZV9mb3JfdGhpc19jb21taXQoZ2l0X2NvbW1pdD1Ob25lLCByZXR1 cm5fc3RkZXJyPVRydWUpCisgICAgICAgICMgVGhyb3cgYXdheSB0aGUgZmlyc3QgbGluZSAtIGEg d2FybmluZyBhYm91dCB1bmtub3duIFZDUyByb290LgorICAgICAgICBjb21taXRfbWVzc2FnZS5t ZXNzYWdlX2xpbmVzID0gY29tbWl0X21lc3NhZ2UubWVzc2FnZV9saW5lc1sxOl0KICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChjb21taXRfbWVzc2FnZS5tZXNzYWdlKCksIHNlbGYuZXhwZWN0ZWRf Y29tbWl0X21lc3NhZ2UpCiAKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9z dHlsZS9jaGVja2Vycy9qc29uY2hlY2tlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5 bGUvY2hlY2tlcnMvanNvbmNoZWNrZXIucHkKaW5kZXggMGMyYzg3ZmVlYTBhZWY2MzNhYzkyNWVm NTQ0ODVmMTJhOTI4ZTU5OS4uNTIwYjg3NThkODUxY2FjYjA0OWMwYjdlZWQ2MDc5NjBhOWZhNmI3 ZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9qc29u Y2hlY2tlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2pz b25jaGVja2VyLnB5CkBAIC00NCwxMSArNDQsMTEgQEAgY2xhc3MgSlNPTkNoZWNrZXIob2JqZWN0 KToKICAgICAgICAgdHJ5OgogICAgICAgICAgICAganNvbi5sb2FkcygnXG4nLmpvaW4obGluZXMp ICsgJ1xuJykKICAgICAgICAgZXhjZXB0IFZhbHVlRXJyb3IsIGU6Ci0gICAgICAgICAgICBzZWxm Ll9oYW5kbGVfc3R5bGVfZXJyb3Ioc2VsZi5saW5lX251bWJlcl9mcm9tX2pzb25fZXhjZXB0aW9u KGUpLCAnanNvbi9zeW50YXgnLCA1LCBlLm1lc3NhZ2UpCisgICAgICAgICAgICBzZWxmLl9oYW5k bGVfc3R5bGVfZXJyb3Ioc2VsZi5saW5lX251bWJlcl9mcm9tX2pzb25fZXhjZXB0aW9uKGUpLCAn anNvbi9zeW50YXgnLCA1LCBzdHIoZSkpCiAKICAgICBAc3RhdGljbWV0aG9kCiAgICAgZGVmIGxp bmVfbnVtYmVyX2Zyb21fanNvbl9leGNlcHRpb24oZXJyb3IpOgotICAgICAgICBtYXRjaCA9IHJl LnNlYXJjaChyJzogbGluZSAoP1A8bGluZT5cZCspIGNvbHVtbiBcZCsnLCBlcnJvci5tZXNzYWdl KQorICAgICAgICBtYXRjaCA9IHJlLnNlYXJjaChyJzogbGluZSAoP1A8bGluZT5cZCspIGNvbHVt biBcZCsnLCBzdHIoZXJyb3IpKQogICAgICAgICBpZiBub3QgbWF0Y2g6CiAgICAgICAgICAgICBy ZXR1cm4gMAogICAgICAgICByZXR1cm4gaW50KG1hdGNoLmdyb3VwKCdsaW5lJykpCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvbWFpbi5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdGVzdC9tYWluLnB5CmluZGV4IDliMDNjY2VkOTEwNTlmYjBjZWIzOTM4MzE2MmEz OGMzOGQyMTJkZTQuLmMzZjdiODU3MWFiNzQzNjliMDllNjUwZDljZmQ4MjhhMTgyOWE2ODIgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWluLnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWluLnB5CkBAIC0xMTYsNyArMTE2LDcgQEAgY2xhc3Mg VGVzdGVyKG9iamVjdCk6CiAgICAgICAgICAgICBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0 b2luc3RhbGxlZC54bWxydW5uZXIgaW1wb3J0IFhNTFRlc3RSdW5uZXIKICAgICAgICAgICAgIHRl c3RfcnVubmVyID0gWE1MVGVzdFJ1bm5lcihvdXRwdXQ9J3Rlc3Qtd2Via2l0cHkteG1sLXJlcG9y dHMnKQogICAgICAgICBlbHNlOgotICAgICAgICAgICAgdGVzdF9ydW5uZXIgPSB1bml0dGVzdC5U ZXh0VGVzdFJ1bm5lcigpCisgICAgICAgICAgICB0ZXN0X3J1bm5lciA9IHVuaXR0ZXN0LlRleHRU ZXN0UnVubmVyCiAKICAgICAgICAgaWYgbGVuKHN5c19hcmd2KSA+IDEgYW5kIG5vdCBzeXNfYXJn dlstMV0uc3RhcnRzd2l0aCgiLSIpOgogICAgICAgICAgICAgIyBUaGVuIGV4cGxpY2l0IG1vZHVs ZXMgb3IgdGVzdCBuYW1lcyB3ZXJlIHByb3ZpZGVkLCB3aGljaAo=