37850 2010-04-20 04:38:07 -0700 check-webkit-style: Add __eq__ and __ne__ methods to DefaultStyleErrorHandler 2010-04-20 13:54:38 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 37066 1 cjerdonek cjerdonek abarth cjerdonek commit-queue eric hamaji webkit.review.bot oldest_to_newest 214567 0 cjerdonek 2010-04-20 04:38:07 -0700 This will facilitate unit testing for bug 37066. 214573 1 53796 cjerdonek 2010-04-20 04:51:59 -0700 Created attachment 53796 Proposed patch 214577 2 53798 cjerdonek 2010-04-20 05:03:00 -0700 Created attachment 53798 Proposed patch 2 Tweaked two docstrings (added missing "the"). 214578 3 53796 hamaji 2010-04-20 05:10:31 -0700 Comment on attachment 53796 Proposed patch Looks good. > + def test_eq__true_return_value(self): Maybe too many underscores after "eq"? > + def test_eq__false_return_value(self): Maybe too many underscores after "eq"? 214583 4 cjerdonek 2010-04-20 05:27:27 -0700 (In reply to comment #3) > (From update of attachment 53796 [details]) > Looks good. > > > + def test_eq__true_return_value(self): > > Maybe too many underscores after "eq"? > > > + def test_eq__false_return_value(self): > > Maybe too many underscores after "eq"? This is a style I learned from working on the Python source code and that I think is nice. The style is to give unit tests names of the form-- test_methodbeingtested__usecasedescription The double underscore is helpful because "methodbeingtested" itself often has underscores. You can see an example of this style in the unit tests for the unittest module itself: http://svn.python.org/view/python/trunk/Lib/unittest/test/test_loader.py?revision=79464&view=markup Do you think this style is okay? Note that this is a somewhat unusual case to start using the style with since __eq__ itself begins and ends with two underscores. But it is probably best to leave those out of "methodbeingtested" in this case, or else we would have four consecutive underscores in the name. :) 214585 5 cjerdonek 2010-04-20 05:35:28 -0700 If you'd like, for consistency I could adjust the names of the other test methods in the class. They would like something like-- test_call__non_reportable_error instead of-- test_non_reportable_error By the way, thanks for reviewing so quickly! 214591 6 53798 hamaji 2010-04-20 05:44:18 -0700 Comment on attachment 53798 Proposed patch 2 I see. Thanks for your explanation. I have no preference for this. Please name methods as you like. I guess it's worth writing this rule in our python guideline? 214596 7 cjerdonek 2010-04-20 05:59:12 -0700 (In reply to comment #6) > (From update of attachment 53798 [details]) > I see. Thanks for your explanation. I have no preference for this. Please name > methods as you like. I guess it's worth writing this rule in our python > guideline? Good suggestion. I added a note about this on the wiki page: https://trac.webkit.org/wiki/PythonGuidelines#Style 214866 8 53798 commit-queue 2010-04-20 12:34:17 -0700 Comment on attachment 53798 Proposed patch 2 Clearing flags on attachment: 53798 Committed r57905: <http://trac.webkit.org/changeset/57905> 214867 9 commit-queue 2010-04-20 12:34:22 -0700 All reviewed patches have been landed. Closing bug. 214928 10 webkit.review.bot 2010-04-20 13:54:38 -0700 http://trac.webkit.org/changeset/57905 might have broken Windows Debug (Tests) The following changes are on the blame list: http://trac.webkit.org/changeset/57904 http://trac.webkit.org/changeset/57905 http://trac.webkit.org/changeset/57906 http://trac.webkit.org/changeset/57907 http://trac.webkit.org/changeset/57908 53796 2010-04-20 04:51:59 -0700 2010-04-20 05:10:30 -0700 Proposed patch _patch-37850-1.diff text/plain 6958 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhMWIwYmMxLi4yZjJmMzQ0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTAtMDQt MjAgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm9yIGNoZWNrLXdlYmtpdC1zdHls ZSwgaW1wbGVtZW50ZWQgX19lcV9fKCkgYW5kIF9fbmVfXygpICh0aGUKKyAgICAgICAgYnVpbHQt aW4gZXF1YWxpdHkgYW5kIGluZXF1YWxpdHkgbWV0aG9kcykgZm9yIHRoZQorICAgICAgICBEZWZh dWx0U3R5bGVFcnJvckhhbmRsZXIgY2xhc3MuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTM3ODUwCisKKyAgICAgICAgVGhpcyB3aWxsIGZhY2lsaXRh dGUgdW5pdC10ZXN0aW5nIGZvciBhIHN1YnNlcXVlbnQgcGF0Y2gsCisgICAgICAgIG5hbWVseSBm b3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3ODUwCisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2Vycm9yX2hhbmRsZXJzLnB5OgorICAgICAgICAg IC0gQWRkZWQgX19lcV9fKCkgYW5kIF9fbmVfXygpIHRvIHRoZSBEZWZhdWx0U3R5bGVFcnJvckhh bmRsZXIKKyAgICAgICAgICAgIGNsYXNzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9z dHlsZS9lcnJvcl9oYW5kbGVyc191bml0dGVzdC5weToKKyAgICAgICAgICAtIEFkZGVkIHVuaXQg dGVzdHMgZm9yIF9fZXFfXygpIGFuZCBfX25lX18oKS4KKyAgICAgICAgICAtIEFsc28gaW5jbHVk ZWQgYSBtaW5vciBjbGVhbi11cCByZWZhY3RvcmluZyBvZiBjb21iaW5pbmcgdGhlCisgICAgICAg ICAgICBTdHlsZUVycm9ySGFuZGxlclRlc3RCYXNlIGNsYXNzICh3aGljaCBoYXMgbm90IG5lZWRl ZCB0bworICAgICAgICAgICAgYmUgc2VwYXJhdGUgZHVlIHRvIHByZXZpb3VzIGNoYW5nZXMpIGlu dG8gdGhlCisgICAgICAgICAgICBEZWZhdWx0U3R5bGVFcnJvckhhbmRsZXJUZXN0IGNsYXNzLgor CiAyMDEwLTA0LTIwICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBTaGluaWNoaXJvIEhhbWFqaS4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZXJyb3JfaGFuZGxlcnMucHkgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3N0eWxlL2Vycm9yX2hhbmRsZXJzLnB5CmluZGV4IGVjNTMyZjUuLjU2 NjZiZmIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZXJy b3JfaGFuZGxlcnMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9l cnJvcl9oYW5kbGVycy5weQpAQCAtODYsNiArODYsMjUgQEAgY2xhc3MgRGVmYXVsdFN0eWxlRXJy b3JIYW5kbGVyKG9iamVjdCk6CiAgICAgICAgICMgZXJyb3JzIHBlciBjYXRlZ29yeSBwYXNzZWQg dG8gdGhpcyBpbnN0YW5jZS4KICAgICAgICAgc2VsZi5fY2F0ZWdvcnlfdG90YWxzID0ge30KIAor ICAgICMgVXNlZnVsIGZvciB1bml0IHRlc3RpbmcuCisgICAgZGVmIF9fZXFfXyhzZWxmLCBvdGhl cik6CisgICAgICAgICIiIlJldHVybiB3aGV0aGVyIHRoaXMgaW5zdGFuY2UgaXMgZXF1YWwgdG8g YW5vdGhlci4iIiIKKyAgICAgICAgaWYgc2VsZi5fY29uZmlndXJhdGlvbiAhPSBvdGhlci5fY29u ZmlndXJhdGlvbjoKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQorICAgICAgICBpZiBzZWxmLl9m aWxlX3BhdGggIT0gb3RoZXIuX2ZpbGVfcGF0aDoKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQor ICAgICAgICBpZiBzZWxmLl9pbmNyZW1lbnRfZXJyb3JfY291bnQgIT0gb3RoZXIuX2luY3JlbWVu dF9lcnJvcl9jb3VudDoKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQorICAgICAgICBpZiBzZWxm Ll9saW5lX251bWJlcnMgIT0gb3RoZXIuX2xpbmVfbnVtYmVyczoKKyAgICAgICAgICAgIHJldHVy biBGYWxzZQorCisgICAgICAgIHJldHVybiBUcnVlCisKKyAgICAjIFVzZWZ1bCBmb3IgdW5pdCB0 ZXN0aW5nLgorICAgIGRlZiBfX25lX18oc2VsZiwgb3RoZXIpOgorICAgICAgICAjIFB5dGhvbiBk b2VzIG5vdCBhdXRvbWF0aWNhbGx5IGRlZHVjZSBfX25lX18gZnJvbSBfX2VxX18uCisgICAgICAg IHJldHVybiBub3Qgc2VsZi5fX2VxX18ob3RoZXIpCisKICAgICBkZWYgX2FkZF9yZXBvcnRhYmxl X2Vycm9yKHNlbGYsIGNhdGVnb3J5KToKICAgICAgICAgIiIiSW5jcmVtZW50IHRoZSBlcnJvciBj b3VudCBhbmQgcmV0dXJuIHRoZSBuZXcgY2F0ZWdvcnkgdG90YWwuIiIiCiAgICAgICAgIHNlbGYu X2luY3JlbWVudF9lcnJvcl9jb3VudCgpICMgSW5jcmVtZW50IHRoZSB0b3RhbC4KZGlmZiAtLWdp dCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZXJyb3JfaGFuZGxlcnNfdW5p dHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2Vycm9yX2hhbmRs ZXJzX3VuaXR0ZXN0LnB5CmluZGV4IDJiYTZlMDAuLjQyMDRlNjYgMTAwNjQ0Ci0tLSBhL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZXJyb3JfaGFuZGxlcnNfdW5pdHRlc3QucHkK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9lcnJvcl9oYW5kbGVyc191 bml0dGVzdC5weQpAQCAtMjksMTIgKzI5LDIxIEBAIGZyb20gY2hlY2tlciBpbXBvcnQgU3R5bGVD aGVja2VyQ29uZmlndXJhdGlvbgogZnJvbSBlcnJvcl9oYW5kbGVycyBpbXBvcnQgRGVmYXVsdFN0 eWxlRXJyb3JIYW5kbGVyCiBmcm9tIGZpbHRlciBpbXBvcnQgRmlsdGVyQ29uZmlndXJhdGlvbgog Ci1jbGFzcyBTdHlsZUVycm9ySGFuZGxlclRlc3RCYXNlKHVuaXR0ZXN0LlRlc3RDYXNlKToKKwor Y2xhc3MgRGVmYXVsdFN0eWxlRXJyb3JIYW5kbGVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CisK KyAgICAiIiJUZXN0cyB0aGUgRGVmYXVsdFN0eWxlRXJyb3JIYW5kbGVyIGNsYXNzLiIiIgogCiAg ICAgZGVmIHNldFVwKHNlbGYpOgogICAgICAgICBzZWxmLl9lcnJvcl9tZXNzYWdlcyA9IFtdCiAg ICAgICAgIHNlbGYuX2Vycm9yX2NvdW50ID0gMAogCisgICAgX2NhdGVnb3J5ID0gIndoaXRlc3Bh Y2UvdGFiIgorICAgICIiIlRoZSBjYXRlZ29yeSBuYW1lIGZvciB0aGUgdGVzdHMgaW4gdGhpcyBj bGFzcy4iIiIKKworICAgIF9maWxlX3BhdGggPSAiZm9vLmgiCisgICAgIiIiVGhlIGZpbGUgcGF0 aCBmb3IgdGhlIHRlc3RzIGluIHRoaXMgY2xhc3MuIiIiCisKICAgICBkZWYgX21vY2tfaW5jcmVt ZW50X2Vycm9yX2NvdW50KHNlbGYpOgogICAgICAgICBzZWxmLl9lcnJvcl9jb3VudCArPSAxCiAK QEAgLTUzLDI4ICs2MiwxNyBAQCBjbGFzcyBTdHlsZUVycm9ySGFuZGxlclRlc3RCYXNlKHVuaXR0 ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgICAgICAgICBvdXRwdXRfZm9ybWF0PSJ2czciLAog ICAgICAgICAgICAgICAgICAgIHN0ZGVycl93cml0ZT1zZWxmLl9tb2NrX3N0ZGVycl93cml0ZSkK IAotCi1jbGFzcyBEZWZhdWx0U3R5bGVFcnJvckhhbmRsZXJUZXN0KFN0eWxlRXJyb3JIYW5kbGVy VGVzdEJhc2UpOgotCi0gICAgIiIiVGVzdHMgRGVmYXVsdFN0eWxlRXJyb3JIYW5kbGVyIGNsYXNz LiIiIgotCi0gICAgX2NhdGVnb3J5ID0gIndoaXRlc3BhY2UvdGFiIgotICAgICIiIlRoZSBjYXRl Z29yeSBuYW1lIGZvciB0aGUgdGVzdHMgaW4gdGhpcyBjbGFzcy4iIiIKLQotICAgIF9maWxlX3Bh dGggPSAiZm9vLmgiCi0gICAgIiIiVGhlIGZpbGUgcGF0aCBmb3IgdGhlIHRlc3RzIGluIHRoaXMg Y2xhc3MuIiIiCi0KLSAgICBkZWYgX2NoZWNrX2luaXRpYWxpemVkKHNlbGYpOgotICAgICAgICAi IiJDaGVjayB0aGF0IGNvdW50IGFuZCBlcnJvciBtZXNzYWdlcyBhcmUgaW5pdGlhbGl6ZWQuIiIi Ci0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKDAsIHNlbGYuX2Vycm9yX2NvdW50KQotICAgICAg ICBzZWxmLmFzc2VydEVxdWFscygwLCBsZW4oc2VsZi5fZXJyb3JfbWVzc2FnZXMpKQotCiAgICAg ZGVmIF9lcnJvcl9oYW5kbGVyKHNlbGYsIGNvbmZpZ3VyYXRpb24sIGxpbmVfbnVtYmVycz1Ob25l KToKICAgICAgICAgcmV0dXJuIERlZmF1bHRTdHlsZUVycm9ySGFuZGxlcihjb25maWd1cmF0aW9u PWNvbmZpZ3VyYXRpb24sCiAgICAgICAgICAgICAgICAgICAgZmlsZV9wYXRoPXNlbGYuX2ZpbGVf cGF0aCwKICAgICAgICAgICAgICAgICAgICBpbmNyZW1lbnRfZXJyb3JfY291bnQ9c2VsZi5fbW9j a19pbmNyZW1lbnRfZXJyb3JfY291bnQsCiAgICAgICAgICAgICAgICAgICAgbGluZV9udW1iZXJz PWxpbmVfbnVtYmVycykKIAorICAgIGRlZiBfY2hlY2tfaW5pdGlhbGl6ZWQoc2VsZik6CisgICAg ICAgICIiIkNoZWNrIHRoYXQgY291bnQgYW5kIGVycm9yIG1lc3NhZ2VzIGFyZSBpbml0aWFsaXpl ZC4iIiIKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoMCwgc2VsZi5fZXJyb3JfY291bnQpCisg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKDAsIGxlbihzZWxmLl9lcnJvcl9tZXNzYWdlcykpCisK ICAgICBkZWYgX2NhbGxfZXJyb3JfaGFuZGxlcihzZWxmLCBoYW5kbGVfZXJyb3IsIGNvbmZpZGVu Y2UsIGxpbmVfbnVtYmVyPTEwMCk6CiAgICAgICAgICIiIkNhbGwgdGhlIGdpdmVuIGVycm9yIGhh bmRsZXIgd2l0aCBhIHRlc3QgZXJyb3IuIiIiCiAgICAgICAgIGhhbmRsZV9lcnJvcihsaW5lX251 bWJlcj1saW5lX251bWJlciwKQEAgLTgyLDYgKzgwLDQ0IEBAIGNsYXNzIERlZmF1bHRTdHlsZUVy cm9ySGFuZGxlclRlc3QoU3R5bGVFcnJvckhhbmRsZXJUZXN0QmFzZSk6CiAgICAgICAgICAgICAg ICAgICAgICBjb25maWRlbmNlPWNvbmZpZGVuY2UsCiAgICAgICAgICAgICAgICAgICAgICBtZXNz YWdlPSJtZXNzYWdlIikKIAorICAgIGRlZiB0ZXN0X2VxX190cnVlX3JldHVybl92YWx1ZShzZWxm KToKKyAgICAgICAgIiIiVGVzdCB0aGUgX19lcV9fKCkgbWV0aG9kIGZvciByZXR1cm4gdmFsdWUg b2YgVHJ1ZS4iIiIKKyAgICAgICAgaGFuZGxlcjEgPSBzZWxmLl9lcnJvcl9oYW5kbGVyKGNvbmZp Z3VyYXRpb249Tm9uZSkKKyAgICAgICAgaGFuZGxlcjIgPSBzZWxmLl9lcnJvcl9oYW5kbGVyKGNv bmZpZ3VyYXRpb249Tm9uZSkKKworICAgICAgICBzZWxmLmFzc2VydFRydWUoaGFuZGxlcjEuX19l cV9fKGhhbmRsZXIyKSkKKworICAgIGRlZiB0ZXN0X2VxX19mYWxzZV9yZXR1cm5fdmFsdWUoc2Vs Zik6CisgICAgICAgICIiIlRlc3QgdGhlIF9fZXFfXygpIG1ldGhvZCBmb3IgcmV0dXJuIHZhbHVl IG9mIEZhbHNlLiIiIgorICAgICAgICBkZWYgbWFrZV9oYW5kbGVyKGNvbmZpZ3VyYXRpb249c2Vs Zi5fc3R5bGVfY2hlY2tlcl9jb25maWd1cmF0aW9uKCksCisgICAgICAgICAgICAgICAgZmlsZV9w YXRoPSdmb28udHh0JywgaW5jcmVtZW50X2Vycm9yX2NvdW50PWxhbWJkYTogVHJ1ZSwKKyAgICAg ICAgICAgICAgICBsaW5lX251bWJlcnM9WzEwMF0pOgorICAgICAgICAgICAgcmV0dXJuIERlZmF1 bHRTdHlsZUVycm9ySGFuZGxlcihjb25maWd1cmF0aW9uPWNvbmZpZ3VyYXRpb24sCisgICAgICAg ICAgICAgICAgICAgICAgIGZpbGVfcGF0aD1maWxlX3BhdGgsCisgICAgICAgICAgICAgICAgICAg ICAgIGluY3JlbWVudF9lcnJvcl9jb3VudD1pbmNyZW1lbnRfZXJyb3JfY291bnQsCisgICAgICAg ICAgICAgICAgICAgICAgIGxpbmVfbnVtYmVycz1saW5lX251bWJlcnMpCisKKyAgICAgICAgaGFu ZGxlciA9IG1ha2VfaGFuZGxlcigpCisKKyAgICAgICAgIyBFc3RhYmxpc2ggYSBiYXNlbGluZSBm b3Igb3VyIGNvbXBhcmlzb25zIGJlbG93LgorICAgICAgICBzZWxmLmFzc2VydFRydWUoaGFuZGxl ci5fX2VxX18obWFrZV9oYW5kbGVyKCkpKQorCisgICAgICAgICMgVmVyaWZ5IHRoYXQgYSBkaWZm ZXJlbmNlIGluIGFueSBhcmd1bWVudCBjYXVzZXMgZXF1YWxpdHkgdG8gZmFpbC4KKyAgICAgICAg c2VsZi5hc3NlcnRGYWxzZShoYW5kbGVyLl9fZXFfXyhtYWtlX2hhbmRsZXIoY29uZmlndXJhdGlv bj1Ob25lKSkpCisgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoaGFuZGxlci5fX2VxX18obWFrZV9o YW5kbGVyKGZpbGVfcGF0aD0nYmFyLnR4dCcpKSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZSho YW5kbGVyLl9fZXFfXyhtYWtlX2hhbmRsZXIoaW5jcmVtZW50X2Vycm9yX2NvdW50PU5vbmUpKSkK KyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShoYW5kbGVyLl9fZXFfXyhtYWtlX2hhbmRsZXIobGlu ZV9udW1iZXJzPVs1MF0pKSkKKworICAgIGRlZiB0ZXN0X25lKHNlbGYpOgorICAgICAgICAiIiJU ZXN0IHRoZSBfX25lX18oKSBtZXRob2QuIiIiCisgICAgICAgICMgQnkgZGVmYXVsdCwgX19uZV9f IGFsd2F5cyByZXR1cm5zIHRydWUgb24gZGlmZmVyZW50IG9iamVjdHMuCisgICAgICAgICMgVGh1 cywgY2hlY2sganVzdCB0aGUgZGlzdGluZ3Vpc2hpbmcgY2FzZSB0byB2ZXJpZnkgdGhhdCB0aGUK KyAgICAgICAgIyBjb2RlIGRlZmluZXMgX19uZV9fLgorICAgICAgICBoYW5kbGVyMSA9IHNlbGYu X2Vycm9yX2hhbmRsZXIoY29uZmlndXJhdGlvbj1Ob25lKQorICAgICAgICBoYW5kbGVyMiA9IHNl bGYuX2Vycm9yX2hhbmRsZXIoY29uZmlndXJhdGlvbj1Ob25lKQorCisgICAgICAgIHNlbGYuYXNz ZXJ0RmFsc2UoaGFuZGxlcjEuX19uZV9fKGhhbmRsZXIyKSkKKwogICAgIGRlZiB0ZXN0X25vbl9y ZXBvcnRhYmxlX2Vycm9yKHNlbGYpOgogICAgICAgICAiIiJUZXN0IF9fY2FsbF9fKCkgd2l0aCBh IG5vbi1yZXBvcnRhYmxlIGVycm9yLiIiIgogICAgICAgICBzZWxmLl9jaGVja19pbml0aWFsaXpl ZCgpCg== 53798 2010-04-20 05:03:00 -0700 2010-04-20 12:34:17 -0700 Proposed patch 2 _patch-37850-2.diff text/plain 6966 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhMWIwYmMxLi4yZjJmMzQ0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTAtMDQt MjAgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm9yIGNoZWNrLXdlYmtpdC1zdHls ZSwgaW1wbGVtZW50ZWQgX19lcV9fKCkgYW5kIF9fbmVfXygpICh0aGUKKyAgICAgICAgYnVpbHQt aW4gZXF1YWxpdHkgYW5kIGluZXF1YWxpdHkgbWV0aG9kcykgZm9yIHRoZQorICAgICAgICBEZWZh dWx0U3R5bGVFcnJvckhhbmRsZXIgY2xhc3MuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTM3ODUwCisKKyAgICAgICAgVGhpcyB3aWxsIGZhY2lsaXRh dGUgdW5pdC10ZXN0aW5nIGZvciBhIHN1YnNlcXVlbnQgcGF0Y2gsCisgICAgICAgIG5hbWVseSBm b3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3ODUwCisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2Vycm9yX2hhbmRsZXJzLnB5OgorICAgICAgICAg IC0gQWRkZWQgX19lcV9fKCkgYW5kIF9fbmVfXygpIHRvIHRoZSBEZWZhdWx0U3R5bGVFcnJvckhh bmRsZXIKKyAgICAgICAgICAgIGNsYXNzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9z dHlsZS9lcnJvcl9oYW5kbGVyc191bml0dGVzdC5weToKKyAgICAgICAgICAtIEFkZGVkIHVuaXQg dGVzdHMgZm9yIF9fZXFfXygpIGFuZCBfX25lX18oKS4KKyAgICAgICAgICAtIEFsc28gaW5jbHVk ZWQgYSBtaW5vciBjbGVhbi11cCByZWZhY3RvcmluZyBvZiBjb21iaW5pbmcgdGhlCisgICAgICAg ICAgICBTdHlsZUVycm9ySGFuZGxlclRlc3RCYXNlIGNsYXNzICh3aGljaCBoYXMgbm90IG5lZWRl ZCB0bworICAgICAgICAgICAgYmUgc2VwYXJhdGUgZHVlIHRvIHByZXZpb3VzIGNoYW5nZXMpIGlu dG8gdGhlCisgICAgICAgICAgICBEZWZhdWx0U3R5bGVFcnJvckhhbmRsZXJUZXN0IGNsYXNzLgor CiAyMDEwLTA0LTIwICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBTaGluaWNoaXJvIEhhbWFqaS4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZXJyb3JfaGFuZGxlcnMucHkgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3N0eWxlL2Vycm9yX2hhbmRsZXJzLnB5CmluZGV4IGVjNTMyZjUuLjU2 NjZiZmIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZXJy b3JfaGFuZGxlcnMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9l cnJvcl9oYW5kbGVycy5weQpAQCAtODYsNiArODYsMjUgQEAgY2xhc3MgRGVmYXVsdFN0eWxlRXJy b3JIYW5kbGVyKG9iamVjdCk6CiAgICAgICAgICMgZXJyb3JzIHBlciBjYXRlZ29yeSBwYXNzZWQg dG8gdGhpcyBpbnN0YW5jZS4KICAgICAgICAgc2VsZi5fY2F0ZWdvcnlfdG90YWxzID0ge30KIAor ICAgICMgVXNlZnVsIGZvciB1bml0IHRlc3RpbmcuCisgICAgZGVmIF9fZXFfXyhzZWxmLCBvdGhl cik6CisgICAgICAgICIiIlJldHVybiB3aGV0aGVyIHRoaXMgaW5zdGFuY2UgaXMgZXF1YWwgdG8g YW5vdGhlci4iIiIKKyAgICAgICAgaWYgc2VsZi5fY29uZmlndXJhdGlvbiAhPSBvdGhlci5fY29u ZmlndXJhdGlvbjoKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQorICAgICAgICBpZiBzZWxmLl9m aWxlX3BhdGggIT0gb3RoZXIuX2ZpbGVfcGF0aDoKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQor ICAgICAgICBpZiBzZWxmLl9pbmNyZW1lbnRfZXJyb3JfY291bnQgIT0gb3RoZXIuX2luY3JlbWVu dF9lcnJvcl9jb3VudDoKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQorICAgICAgICBpZiBzZWxm Ll9saW5lX251bWJlcnMgIT0gb3RoZXIuX2xpbmVfbnVtYmVyczoKKyAgICAgICAgICAgIHJldHVy biBGYWxzZQorCisgICAgICAgIHJldHVybiBUcnVlCisKKyAgICAjIFVzZWZ1bCBmb3IgdW5pdCB0 ZXN0aW5nLgorICAgIGRlZiBfX25lX18oc2VsZiwgb3RoZXIpOgorICAgICAgICAjIFB5dGhvbiBk b2VzIG5vdCBhdXRvbWF0aWNhbGx5IGRlZHVjZSBfX25lX18gZnJvbSBfX2VxX18uCisgICAgICAg IHJldHVybiBub3Qgc2VsZi5fX2VxX18ob3RoZXIpCisKICAgICBkZWYgX2FkZF9yZXBvcnRhYmxl X2Vycm9yKHNlbGYsIGNhdGVnb3J5KToKICAgICAgICAgIiIiSW5jcmVtZW50IHRoZSBlcnJvciBj b3VudCBhbmQgcmV0dXJuIHRoZSBuZXcgY2F0ZWdvcnkgdG90YWwuIiIiCiAgICAgICAgIHNlbGYu X2luY3JlbWVudF9lcnJvcl9jb3VudCgpICMgSW5jcmVtZW50IHRoZSB0b3RhbC4KZGlmZiAtLWdp dCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZXJyb3JfaGFuZGxlcnNfdW5p dHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2Vycm9yX2hhbmRs ZXJzX3VuaXR0ZXN0LnB5CmluZGV4IDJiYTZlMDAuLjA1ZTcyNWEgMTAwNjQ0Ci0tLSBhL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZXJyb3JfaGFuZGxlcnNfdW5pdHRlc3QucHkK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9lcnJvcl9oYW5kbGVyc191 bml0dGVzdC5weQpAQCAtMjksMTIgKzI5LDIxIEBAIGZyb20gY2hlY2tlciBpbXBvcnQgU3R5bGVD aGVja2VyQ29uZmlndXJhdGlvbgogZnJvbSBlcnJvcl9oYW5kbGVycyBpbXBvcnQgRGVmYXVsdFN0 eWxlRXJyb3JIYW5kbGVyCiBmcm9tIGZpbHRlciBpbXBvcnQgRmlsdGVyQ29uZmlndXJhdGlvbgog Ci1jbGFzcyBTdHlsZUVycm9ySGFuZGxlclRlc3RCYXNlKHVuaXR0ZXN0LlRlc3RDYXNlKToKKwor Y2xhc3MgRGVmYXVsdFN0eWxlRXJyb3JIYW5kbGVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CisK KyAgICAiIiJUZXN0cyB0aGUgRGVmYXVsdFN0eWxlRXJyb3JIYW5kbGVyIGNsYXNzLiIiIgogCiAg ICAgZGVmIHNldFVwKHNlbGYpOgogICAgICAgICBzZWxmLl9lcnJvcl9tZXNzYWdlcyA9IFtdCiAg ICAgICAgIHNlbGYuX2Vycm9yX2NvdW50ID0gMAogCisgICAgX2NhdGVnb3J5ID0gIndoaXRlc3Bh Y2UvdGFiIgorICAgICIiIlRoZSBjYXRlZ29yeSBuYW1lIGZvciB0aGUgdGVzdHMgaW4gdGhpcyBj bGFzcy4iIiIKKworICAgIF9maWxlX3BhdGggPSAiZm9vLmgiCisgICAgIiIiVGhlIGZpbGUgcGF0 aCBmb3IgdGhlIHRlc3RzIGluIHRoaXMgY2xhc3MuIiIiCisKICAgICBkZWYgX21vY2tfaW5jcmVt ZW50X2Vycm9yX2NvdW50KHNlbGYpOgogICAgICAgICBzZWxmLl9lcnJvcl9jb3VudCArPSAxCiAK QEAgLTUzLDI4ICs2MiwxNyBAQCBjbGFzcyBTdHlsZUVycm9ySGFuZGxlclRlc3RCYXNlKHVuaXR0 ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgICAgICAgICBvdXRwdXRfZm9ybWF0PSJ2czciLAog ICAgICAgICAgICAgICAgICAgIHN0ZGVycl93cml0ZT1zZWxmLl9tb2NrX3N0ZGVycl93cml0ZSkK IAotCi1jbGFzcyBEZWZhdWx0U3R5bGVFcnJvckhhbmRsZXJUZXN0KFN0eWxlRXJyb3JIYW5kbGVy VGVzdEJhc2UpOgotCi0gICAgIiIiVGVzdHMgRGVmYXVsdFN0eWxlRXJyb3JIYW5kbGVyIGNsYXNz LiIiIgotCi0gICAgX2NhdGVnb3J5ID0gIndoaXRlc3BhY2UvdGFiIgotICAgICIiIlRoZSBjYXRl Z29yeSBuYW1lIGZvciB0aGUgdGVzdHMgaW4gdGhpcyBjbGFzcy4iIiIKLQotICAgIF9maWxlX3Bh dGggPSAiZm9vLmgiCi0gICAgIiIiVGhlIGZpbGUgcGF0aCBmb3IgdGhlIHRlc3RzIGluIHRoaXMg Y2xhc3MuIiIiCi0KLSAgICBkZWYgX2NoZWNrX2luaXRpYWxpemVkKHNlbGYpOgotICAgICAgICAi IiJDaGVjayB0aGF0IGNvdW50IGFuZCBlcnJvciBtZXNzYWdlcyBhcmUgaW5pdGlhbGl6ZWQuIiIi Ci0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKDAsIHNlbGYuX2Vycm9yX2NvdW50KQotICAgICAg ICBzZWxmLmFzc2VydEVxdWFscygwLCBsZW4oc2VsZi5fZXJyb3JfbWVzc2FnZXMpKQotCiAgICAg ZGVmIF9lcnJvcl9oYW5kbGVyKHNlbGYsIGNvbmZpZ3VyYXRpb24sIGxpbmVfbnVtYmVycz1Ob25l KToKICAgICAgICAgcmV0dXJuIERlZmF1bHRTdHlsZUVycm9ySGFuZGxlcihjb25maWd1cmF0aW9u PWNvbmZpZ3VyYXRpb24sCiAgICAgICAgICAgICAgICAgICAgZmlsZV9wYXRoPXNlbGYuX2ZpbGVf cGF0aCwKICAgICAgICAgICAgICAgICAgICBpbmNyZW1lbnRfZXJyb3JfY291bnQ9c2VsZi5fbW9j a19pbmNyZW1lbnRfZXJyb3JfY291bnQsCiAgICAgICAgICAgICAgICAgICAgbGluZV9udW1iZXJz PWxpbmVfbnVtYmVycykKIAorICAgIGRlZiBfY2hlY2tfaW5pdGlhbGl6ZWQoc2VsZik6CisgICAg ICAgICIiIkNoZWNrIHRoYXQgY291bnQgYW5kIGVycm9yIG1lc3NhZ2VzIGFyZSBpbml0aWFsaXpl ZC4iIiIKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoMCwgc2VsZi5fZXJyb3JfY291bnQpCisg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKDAsIGxlbihzZWxmLl9lcnJvcl9tZXNzYWdlcykpCisK ICAgICBkZWYgX2NhbGxfZXJyb3JfaGFuZGxlcihzZWxmLCBoYW5kbGVfZXJyb3IsIGNvbmZpZGVu Y2UsIGxpbmVfbnVtYmVyPTEwMCk6CiAgICAgICAgICIiIkNhbGwgdGhlIGdpdmVuIGVycm9yIGhh bmRsZXIgd2l0aCBhIHRlc3QgZXJyb3IuIiIiCiAgICAgICAgIGhhbmRsZV9lcnJvcihsaW5lX251 bWJlcj1saW5lX251bWJlciwKQEAgLTgyLDYgKzgwLDQ0IEBAIGNsYXNzIERlZmF1bHRTdHlsZUVy cm9ySGFuZGxlclRlc3QoU3R5bGVFcnJvckhhbmRsZXJUZXN0QmFzZSk6CiAgICAgICAgICAgICAg ICAgICAgICBjb25maWRlbmNlPWNvbmZpZGVuY2UsCiAgICAgICAgICAgICAgICAgICAgICBtZXNz YWdlPSJtZXNzYWdlIikKIAorICAgIGRlZiB0ZXN0X2VxX190cnVlX3JldHVybl92YWx1ZShzZWxm KToKKyAgICAgICAgIiIiVGVzdCB0aGUgX19lcV9fKCkgbWV0aG9kIGZvciB0aGUgcmV0dXJuIHZh bHVlIG9mIFRydWUuIiIiCisgICAgICAgIGhhbmRsZXIxID0gc2VsZi5fZXJyb3JfaGFuZGxlcihj b25maWd1cmF0aW9uPU5vbmUpCisgICAgICAgIGhhbmRsZXIyID0gc2VsZi5fZXJyb3JfaGFuZGxl cihjb25maWd1cmF0aW9uPU5vbmUpCisKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGhhbmRsZXIx Ll9fZXFfXyhoYW5kbGVyMikpCisKKyAgICBkZWYgdGVzdF9lcV9fZmFsc2VfcmV0dXJuX3ZhbHVl KHNlbGYpOgorICAgICAgICAiIiJUZXN0IHRoZSBfX2VxX18oKSBtZXRob2QgZm9yIHRoZSByZXR1 cm4gdmFsdWUgb2YgRmFsc2UuIiIiCisgICAgICAgIGRlZiBtYWtlX2hhbmRsZXIoY29uZmlndXJh dGlvbj1zZWxmLl9zdHlsZV9jaGVja2VyX2NvbmZpZ3VyYXRpb24oKSwKKyAgICAgICAgICAgICAg ICBmaWxlX3BhdGg9J2Zvby50eHQnLCBpbmNyZW1lbnRfZXJyb3JfY291bnQ9bGFtYmRhOiBUcnVl LAorICAgICAgICAgICAgICAgIGxpbmVfbnVtYmVycz1bMTAwXSk6CisgICAgICAgICAgICByZXR1 cm4gRGVmYXVsdFN0eWxlRXJyb3JIYW5kbGVyKGNvbmZpZ3VyYXRpb249Y29uZmlndXJhdGlvbiwK KyAgICAgICAgICAgICAgICAgICAgICAgZmlsZV9wYXRoPWZpbGVfcGF0aCwKKyAgICAgICAgICAg ICAgICAgICAgICAgaW5jcmVtZW50X2Vycm9yX2NvdW50PWluY3JlbWVudF9lcnJvcl9jb3VudCwK KyAgICAgICAgICAgICAgICAgICAgICAgbGluZV9udW1iZXJzPWxpbmVfbnVtYmVycykKKworICAg ICAgICBoYW5kbGVyID0gbWFrZV9oYW5kbGVyKCkKKworICAgICAgICAjIEVzdGFibGlzaCBhIGJh c2VsaW5lIGZvciBvdXIgY29tcGFyaXNvbnMgYmVsb3cuCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1 ZShoYW5kbGVyLl9fZXFfXyhtYWtlX2hhbmRsZXIoKSkpCisKKyAgICAgICAgIyBWZXJpZnkgdGhh dCBhIGRpZmZlcmVuY2UgaW4gYW55IGFyZ3VtZW50IGNhdXNlcyBlcXVhbGl0eSB0byBmYWlsLgor ICAgICAgICBzZWxmLmFzc2VydEZhbHNlKGhhbmRsZXIuX19lcV9fKG1ha2VfaGFuZGxlcihjb25m aWd1cmF0aW9uPU5vbmUpKSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShoYW5kbGVyLl9fZXFf XyhtYWtlX2hhbmRsZXIoZmlsZV9wYXRoPSdiYXIudHh0JykpKQorICAgICAgICBzZWxmLmFzc2Vy dEZhbHNlKGhhbmRsZXIuX19lcV9fKG1ha2VfaGFuZGxlcihpbmNyZW1lbnRfZXJyb3JfY291bnQ9 Tm9uZSkpKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKGhhbmRsZXIuX19lcV9fKG1ha2VfaGFu ZGxlcihsaW5lX251bWJlcnM9WzUwXSkpKQorCisgICAgZGVmIHRlc3RfbmUoc2VsZik6CisgICAg ICAgICIiIlRlc3QgdGhlIF9fbmVfXygpIG1ldGhvZC4iIiIKKyAgICAgICAgIyBCeSBkZWZhdWx0 LCBfX25lX18gYWx3YXlzIHJldHVybnMgdHJ1ZSBvbiBkaWZmZXJlbnQgb2JqZWN0cy4KKyAgICAg ICAgIyBUaHVzLCBjaGVjayBqdXN0IHRoZSBkaXN0aW5ndWlzaGluZyBjYXNlIHRvIHZlcmlmeSB0 aGF0IHRoZQorICAgICAgICAjIGNvZGUgZGVmaW5lcyBfX25lX18uCisgICAgICAgIGhhbmRsZXIx ID0gc2VsZi5fZXJyb3JfaGFuZGxlcihjb25maWd1cmF0aW9uPU5vbmUpCisgICAgICAgIGhhbmRs ZXIyID0gc2VsZi5fZXJyb3JfaGFuZGxlcihjb25maWd1cmF0aW9uPU5vbmUpCisKKyAgICAgICAg c2VsZi5hc3NlcnRGYWxzZShoYW5kbGVyMS5fX25lX18oaGFuZGxlcjIpKQorCiAgICAgZGVmIHRl c3Rfbm9uX3JlcG9ydGFibGVfZXJyb3Ioc2VsZik6CiAgICAgICAgICIiIlRlc3QgX19jYWxsX18o KSB3aXRoIGEgbm9uLXJlcG9ydGFibGUgZXJyb3IuIiIiCiAgICAgICAgIHNlbGYuX2NoZWNrX2lu aXRpYWxpemVkKCkK