68869 2011-09-26 22:57:00 -0700 watchlist: Change watchlistparser.py to be class based. 2011-09-27 08:52:19 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 68822 1 levin levin abarth eric oldest_to_newest 473687 0 levin 2011-09-26 22:57:00 -0700 Instead of function based. 473689 1 108790 levin 2011-09-26 23:01:25 -0700 Created attachment 108790 Patch 473728 2 108790 eric 2011-09-27 00:20:58 -0700 Comment on attachment 108790 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=108790&action=review Thanks. I've had to learn this the hard way. Basically it becomes impossible to test static module funtions. Adding them into a class makes it super easy to have the class hold an Executive/FileSystem/User or other mockable object if needed. > Tools/Scripts/webkitpy/common/watchlist/watchlistparser.py:33 > _INVALID_DEFINITION_NAME_REGEX = r'\|' I bet you want to make these class members now too. > Tools/Scripts/webkitpy/common/watchlist/watchlistparser_unittest.py:52 > + watch_list_parser = WatchListParser() You could have a setUp which allocates self.parser = WatchListParser() if you prefer. 473955 3 levin 2011-09-27 08:52:06 -0700 Changed as suggested. Committed as http://trac.webkit.org/changeset/96115. 108790 2011-09-26 23:01:25 -0700 2011-09-27 00:24:05 -0700 Patch bug-68869-20110926230123.patch text/plain 6758 levin U3VidmVyc2lvbiBSZXZpc2lvbjogOTYwNTcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwZTQ0YTNhOGQ1NjE0ODY2OGY1MzQyNmI0MTQ4ODNkZTk4 ZmUzMWJkLi40NWIzZDE5MGVmMDdkMTA4ZmViOGVlMjcyMzlmMjFiOWJjNzc5NWQ4IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTEtMDktMjYgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAg ICAgIHdhdGNobGlzdDogQ2hhbmdlIHdhdGNobGlzdHBhcnNlci5weSB0byBiZSBjbGFzcyBiYXNl ZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4ODY5 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0cGFyc2VyLnB5OgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC93YXRjaGxpc3RwYXJzZXJfdW5p dHRlc3QucHk6CisKIDIwMTEtMDktMjYgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9t aXVtLm9yZz4KIAogICAgICAgICBnYXJkZW4tby1tYXRpYyBzaG91bGQgbm90IHNheSAiSnVzdCBu b3ciIHdoZW4gaXQgZG9lc24ndCBhY3R1YWxseSBrbm93IHdoZW4gYW4gZXZlbnQgaGFwcGVuZWQu CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0 Y2hsaXN0cGFyc2VyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0 L3dhdGNobGlzdHBhcnNlci5weQppbmRleCAwMDMxZDJkZTQzNDVlYWU1MGQwNWNiODc4MzczMTdh ZjAxZWM0YmRlLi5hMjUxZjNiOGU3MjYzNTlmZjYxODRiZmJmYWZjNjZkYzdjZjM0MzE4IDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0 cGFyc2VyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC93 YXRjaGxpc3RwYXJzZXIucHkKQEAgLTMzLDQ0ICszMyw0MyBAQCBfREVGSU5JVElPTlMgPSAnREVG SU5JVElPTlMnCiBfSU5WQUxJRF9ERUZJTklUSU9OX05BTUVfUkVHRVggPSByJ1x8JwogCiAKLWRl ZiBfZXZhbF93YXRjaF9saXN0KHdhdGNoX2xpc3RfY29udGVudHMpOgotICAgIHJldHVybiBldmFs KHdhdGNoX2xpc3RfY29udGVudHMsIHsnX19idWlsdGluc19fJzogTm9uZX0sIE5vbmUpCitjbGFz cyBXYXRjaExpc3RQYXJzZXIob2JqZWN0KToKKyAgICBkZWYgX19pbml0X18oc2VsZik6CisgICAg ICAgIHNlbGYuX3NlY3Rpb25fcGFyc2VycyA9IHtfREVGSU5JVElPTlM6IHNlbGYuX3BhcnNlX2Rl ZmluaXRpb25fc2VjdGlvbiwgfQorICAgICAgICBzZWxmLl9kZWZpbml0aW9uX3BhdHRlcm5fcGFy c2VycyA9IHt9CiAKLV9ERUZJTklUSU9OX01BVENIX1BBUlNFUiA9IHt9CisgICAgZGVmIHBhcnNl KHNlbGYsIHdhdGNoX2xpc3RfY29udGVudHMpOgorICAgICAgICB3YXRjaF9saXN0ID0gV2F0Y2hM aXN0KCkKIAorICAgICAgICAjIENoYW5nZSB0aGUgd2F0Y2ggbGlzdCB0ZXh0IGludG8gYSBkaWN0 aW9uYXJ5LgorICAgICAgICBkaWN0aW9uYXJ5ID0gc2VsZi5fZXZhbF93YXRjaF9saXN0KHdhdGNo X2xpc3RfY29udGVudHMpCiAKLWRlZiBfcGFyc2VfZGVmaW5pdGlvbl9zZWN0aW9uKGRlZmluaXRp b25fc2VjdGlvbiwgd2F0Y2hfbGlzdCk6Ci0gICAgZGVmaW5pdGlvbnMgPSB7fQotICAgIGZvciBu YW1lIGluIGRlZmluaXRpb25fc2VjdGlvbjoKLSAgICAgICAgaW52YWxpZF9jaGFyYWN0ZXIgPSBy ZS5zZWFyY2goX0lOVkFMSURfREVGSU5JVElPTl9OQU1FX1JFR0VYLCBuYW1lKQotICAgICAgICBp ZiBpbnZhbGlkX2NoYXJhY3RlcjoKLSAgICAgICAgICAgIHJhaXNlIEV4Y2VwdGlvbignSW52YWxp ZCBjaGFyYWN0ZXIgIiVzIiBpbiBkZWZpbml0aW9uICIlcyIuJyAlIChpbnZhbGlkX2NoYXJhY3Rl ci5ncm91cCgwKSwgbmFtZSkpCisgICAgICAgICMgUGFyc2UgdGhlIHRvcCBsZXZlbCBzZWN0aW9u cyBpbiB0aGUgd2F0Y2ggbGlzdC4KKyAgICAgICAgZm9yIHNlY3Rpb24gaW4gZGljdGlvbmFyeToK KyAgICAgICAgICAgIHBhcnNlciA9IHNlbGYuX3NlY3Rpb25fcGFyc2Vycy5nZXQoc2VjdGlvbikK KyAgICAgICAgICAgIGlmIG5vdCBwYXJzZXI6CisgICAgICAgICAgICAgICAgcmFpc2UgRXhjZXB0 aW9uKCdVbmtub3duIHNlY3Rpb24gIiVzIiBpbiB3YXRjaCBsaXN0LicgJSBzZWN0aW9uKQorICAg ICAgICAgICAgcGFyc2VyKGRpY3Rpb25hcnlbc2VjdGlvbl0sIHdhdGNoX2xpc3QpCiAKLSAgICAg ICAgZGVmaW5pdGlvbiA9IGRlZmluaXRpb25fc2VjdGlvbltuYW1lXQotICAgICAgICBkZWZpbml0 aW9uc1tuYW1lXSA9IFtdCi0gICAgICAgIGZvciBwYXR0ZXJuX3R5cGUgaW4gZGVmaW5pdGlvbjoK LSAgICAgICAgICAgIHBhdHRlcm5fcGFyc2VyID0gX0RFRklOSVRJT05fTUFUQ0hfUEFSU0VSLmdl dChwYXR0ZXJuX3R5cGUpCi0gICAgICAgICAgICBpZiBub3QgcGF0dGVybl9wYXJzZXI6Ci0gICAg ICAgICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCdJbnZhbGlkIHBhdHRlcm4gdHlwZSAiJXMiIGlu IGRlZmluaXRpb24gIiVzIi4nICUgKHBhdHRlcm5fdHlwZSwgbmFtZSkpCisgICAgICAgIHJldHVy biB3YXRjaF9saXN0CiAKLSAgICAgICAgICAgIHBhdHRlcm4gPSBwYXR0ZXJuX3BhcnNlcihkZWZp bml0aW9uW3BhdHRlcm5fdHlwZV0pCi0gICAgICAgICAgICBkZWZpbml0aW9uc1tuYW1lXS5hcHBl bmQocGF0dGVybikKLSAgICB3YXRjaF9saXN0LnNldF9kZWZpbml0aW9ucyhkZWZpbml0aW9ucykK KyAgICBkZWYgX2V2YWxfd2F0Y2hfbGlzdChzZWxmLCB3YXRjaF9saXN0X2NvbnRlbnRzKToKKyAg ICAgICAgcmV0dXJuIGV2YWwod2F0Y2hfbGlzdF9jb250ZW50cywgeydfX2J1aWx0aW5zX18nOiBO b25lfSwgTm9uZSkKIAotX1NFQ1RJT05fUEFSU0VSUyA9IHtfREVGSU5JVElPTlM6IF9wYXJzZV9k ZWZpbml0aW9uX3NlY3Rpb24sIH0KKyAgICBkZWYgX3BhcnNlX2RlZmluaXRpb25fc2VjdGlvbihz ZWxmLCBkZWZpbml0aW9uX3NlY3Rpb24sIHdhdGNoX2xpc3QpOgorICAgICAgICBkZWZpbml0aW9u cyA9IHt9CisgICAgICAgIGZvciBuYW1lIGluIGRlZmluaXRpb25fc2VjdGlvbjoKKyAgICAgICAg ICAgIGludmFsaWRfY2hhcmFjdGVyID0gcmUuc2VhcmNoKF9JTlZBTElEX0RFRklOSVRJT05fTkFN RV9SRUdFWCwgbmFtZSkKKyAgICAgICAgICAgIGlmIGludmFsaWRfY2hhcmFjdGVyOgorICAgICAg ICAgICAgICAgIHJhaXNlIEV4Y2VwdGlvbignSW52YWxpZCBjaGFyYWN0ZXIgIiVzIiBpbiBkZWZp bml0aW9uICIlcyIuJyAlIChpbnZhbGlkX2NoYXJhY3Rlci5ncm91cCgwKSwgbmFtZSkpCiAKKyAg ICAgICAgICAgIGRlZmluaXRpb24gPSBkZWZpbml0aW9uX3NlY3Rpb25bbmFtZV0KKyAgICAgICAg ICAgIGRlZmluaXRpb25zW25hbWVdID0gW10KKyAgICAgICAgICAgIGZvciBwYXR0ZXJuX3R5cGUg aW4gZGVmaW5pdGlvbjoKKyAgICAgICAgICAgICAgICBwYXR0ZXJuX3BhcnNlciA9IHNlbGYuX2Rl ZmluaXRpb25fcGF0dGVybl9wYXJzZXJzLmdldChwYXR0ZXJuX3R5cGUpCisgICAgICAgICAgICAg ICAgaWYgbm90IHBhdHRlcm5fcGFyc2VyOgorICAgICAgICAgICAgICAgICAgICByYWlzZSBFeGNl cHRpb24oJ0ludmFsaWQgcGF0dGVybiB0eXBlICIlcyIgaW4gZGVmaW5pdGlvbiAiJXMiLicgJSAo cGF0dGVybl90eXBlLCBuYW1lKSkKIAotZGVmIHBhcnNlX3dhdGNoX2xpc3Qod2F0Y2hfbGlzdF9j b250ZW50cyk6Ci0gICAgd2F0Y2hfbGlzdCA9IFdhdGNoTGlzdCgpCi0KLSAgICAjIENoYW5nZSB0 aGUgd2F0Y2ggbGlzdCB0ZXh0IGludG8gYSBkaWN0aW9uYXJ5LgotICAgIGRpY3Rpb25hcnkgPSBf ZXZhbF93YXRjaF9saXN0KHdhdGNoX2xpc3RfY29udGVudHMpCi0KLSAgICAjIFBhcnNlIHRoZSB0 b3AgbGV2ZWwgc2VjdGlvbnMgaW4gdGhlIHdhdGNoIGxpc3QuCi0gICAgZm9yIHNlY3Rpb24gaW4g ZGljdGlvbmFyeToKLSAgICAgICAgcGFyc2VyID0gX1NFQ1RJT05fUEFSU0VSUy5nZXQoc2VjdGlv bikKLSAgICAgICAgaWYgbm90IHBhcnNlcjoKLSAgICAgICAgICAgIHJhaXNlIEV4Y2VwdGlvbign VW5rbm93biBzZWN0aW9uICIlcyIgaW4gd2F0Y2ggbGlzdC4nICUgc2VjdGlvbikKLSAgICAgICAg cGFyc2VyKGRpY3Rpb25hcnlbc2VjdGlvbl0sIHdhdGNoX2xpc3QpCi0KLSAgICByZXR1cm4gd2F0 Y2hfbGlzdAorICAgICAgICAgICAgICAgIHBhdHRlcm4gPSBwYXR0ZXJuX3BhcnNlcihkZWZpbml0 aW9uW3BhdHRlcm5fdHlwZV0pCisgICAgICAgICAgICAgICAgZGVmaW5pdGlvbnNbbmFtZV0uYXBw ZW5kKHBhdHRlcm4pCisgICAgICAgIHdhdGNoX2xpc3Quc2V0X2RlZmluaXRpb25zKGRlZmluaXRp b25zKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0 L3dhdGNobGlzdHBhcnNlcl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL3dhdGNobGlzdC93YXRjaGxpc3RwYXJzZXJfdW5pdHRlc3QucHkKaW5kZXggNDFkMjNmZTI2 N2Y4MzAyZmY2ZTAyMTkyNjcwMjNlNjlkNjBiNWIyMy4uNmQzNGY0NGZkY2NlNzM5MzMyZTUwNGE0 MmE4NjNhNzIyMWQ1NGY5YiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vd2F0Y2hsaXN0L3dhdGNobGlzdHBhcnNlcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0cGFyc2VyX3VuaXR0ZXN0LnB5 CkBAIC0zMCw3ICszMCw3IEBACiAKIGltcG9ydCByZQogaW1wb3J0IHVuaXR0ZXN0Ci1mcm9tIHdl YmtpdHB5LmNvbW1vbi53YXRjaGxpc3Qud2F0Y2hsaXN0cGFyc2VyIGltcG9ydCBwYXJzZV93YXRj aF9saXN0Citmcm9tIHdlYmtpdHB5LmNvbW1vbi53YXRjaGxpc3Qud2F0Y2hsaXN0cGFyc2VyIGlt cG9ydCBXYXRjaExpc3RQYXJzZXIKIAogCiBjbGFzcyBXYXRjaExpc3RQYXJzZXJUZXN0KHVuaXR0 ZXN0LlRlc3RDYXNlKToKQEAgLTQ5LDcgKzQ5LDkgQEAgY2xhc3MgV2F0Y2hMaXN0UGFyc2VyVGVz dCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAKICAgICBkZWYgdGVzdF9iYWRfc2VjdGlvbihzZWxmKToK ICAgICAgICAgd2F0Y2hfbGlzdF93aXRoX2JhZF9zZWN0aW9uID0gKCd7IkZPTyI6IHt9fScpCi0g ICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzUmVnZXhwKCdVbmtub3duIHNlY3Rpb24gIkZPTyIgaW4g d2F0Y2ggbGlzdC4nLCBwYXJzZV93YXRjaF9saXN0LCB3YXRjaF9saXN0X3dpdGhfYmFkX3NlY3Rp b24pCisgICAgICAgIHdhdGNoX2xpc3RfcGFyc2VyID0gV2F0Y2hMaXN0UGFyc2VyKCkKKyAgICAg ICAgc2VsZi5hc3NlcnRSYWlzZXNSZWdleHAoJ1Vua25vd24gc2VjdGlvbiAiRk9PIiBpbiB3YXRj aCBsaXN0LicsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdhdGNoX2xpc3RfcGFy c2VyLnBhcnNlLCB3YXRjaF9saXN0X3dpdGhfYmFkX3NlY3Rpb24pCiAKICAgICBkZWYgdGVzdF9i YWRfZGVmaW5pdGlvbihzZWxmKToKICAgICAgICAgd2F0Y2hfbGlzdF93aXRoX2JhZF9kZWZpbml0 aW9uID0gKApAQCAtNjEsNyArNjMsOSBAQCBjbGFzcyBXYXRjaExpc3RQYXJzZXJUZXN0KHVuaXR0 ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgICcgICAgIH0sJwogICAgICAgICAgICAgJ30nKQog Ci0gICAgICAgIHNlbGYuX3ZlcmlmeUV4Y2VwdGlvbignSW52YWxpZCBjaGFyYWN0ZXIgInwiIGlu IGRlZmluaXRpb24gIldhdGNoTGlzdDF8QSIuJywgcGFyc2Vfd2F0Y2hfbGlzdCwgd2F0Y2hfbGlz dF93aXRoX2JhZF9kZWZpbml0aW9uKQorICAgICAgICB3YXRjaF9saXN0X3BhcnNlciA9IFdhdGNo TGlzdFBhcnNlcigpCisgICAgICAgIHNlbGYuX3ZlcmlmeUV4Y2VwdGlvbignSW52YWxpZCBjaGFy YWN0ZXIgInwiIGluIGRlZmluaXRpb24gIldhdGNoTGlzdDF8QSIuJywKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHdhdGNoX2xpc3RfcGFyc2VyLnBhcnNlLCB3YXRjaF9saXN0X3dpdGhf YmFkX2RlZmluaXRpb24pCiAKICAgICBkZWYgdGVzdF9iYWRfbWF0Y2hfdHlwZShzZWxmKToKICAg ICAgICAgd2F0Y2hfbGlzdF93aXRoX2JhZF9tYXRjaF90eXBlID0gKApAQCAtNzMsNCArNzcsNiBA QCBjbGFzcyBXYXRjaExpc3RQYXJzZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAg ICAgICcgICAgIH0sJwogICAgICAgICAgICAgJ30nKQogCi0gICAgICAgIHNlbGYuX3ZlcmlmeUV4 Y2VwdGlvbignSW52YWxpZCBwYXR0ZXJuIHR5cGUgIm5vdGhpbmdfbWF0Y2hlc190aGlzIiBpbiBk ZWZpbml0aW9uICJXYXRjaExpc3QxIi4nLCBwYXJzZV93YXRjaF9saXN0LCB3YXRjaF9saXN0X3dp dGhfYmFkX21hdGNoX3R5cGUpCisgICAgICAgIHdhdGNoX2xpc3RfcGFyc2VyID0gV2F0Y2hMaXN0 UGFyc2VyKCkKKyAgICAgICAgc2VsZi5fdmVyaWZ5RXhjZXB0aW9uKCdJbnZhbGlkIHBhdHRlcm4g dHlwZSAibm90aGluZ19tYXRjaGVzX3RoaXMiIGluIGRlZmluaXRpb24gIldhdGNoTGlzdDEiLics CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB3YXRjaF9saXN0X3BhcnNlci5wYXJzZSwg d2F0Y2hfbGlzdF93aXRoX2JhZF9tYXRjaF90eXBlKQo=