76233 2012-01-12 17:19:12 -0800 test-webkitpy: should support classes and individual test names as well as modules 2012-01-13 13:24:09 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 76022 1 dpranke dpranke abarth eric ojan webkit.review.bot oldest_to_newest 535323 0 dpranke 2012-01-12 17:19:12 -0800 test-webkitpy: should support classes and individual test names as well as modules 535330 1 122347 dpranke 2012-01-12 17:23:59 -0800 Created attachment 122347 Patch 535926 2 122347 abarth 2012-01-13 13:02:14 -0800 Comment on attachment 122347 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=122347&action=review > Tools/Scripts/webkitpy/test/cat_unittest.py:-31 > - This blank line should stay according to PEP8 > Tools/Scripts/webkitpy/test/main.py:261 > + if os.path.exists(os.path.join(os.path.dirname(d), relpath)): I'm tempted to say we should go through filesystem here, but then again, that's probably not needed. 535931 3 dpranke 2012-01-13 13:09:48 -0800 (In reply to comment #2) > (From update of attachment 122347 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=122347&action=review > > > Tools/Scripts/webkitpy/test/cat_unittest.py:-31 > > - > > This blank line should stay according to PEP8 > Yeah, I'm not sure how that crept in. > > Tools/Scripts/webkitpy/test/main.py:261 > > + if os.path.exists(os.path.join(os.path.dirname(d), relpath)): > > I'm tempted to say we should go through filesystem here, but then again, that's probably not needed. I'm trying to avoid depending on anything (else) from webkitpy, but I suspect at some point I'll have to give just so I can write better tests. 535938 4 dpranke 2012-01-13 13:16:50 -0800 Committed r104977: <http://trac.webkit.org/changeset/104977> 535944 5 dpranke 2012-01-13 13:24:09 -0800 Committed r104980: <http://trac.webkit.org/changeset/104980> 122347 2012-01-12 17:23:59 -0800 2012-01-13 13:02:14 -0800 Patch bug-76233-20120112172358.patch text/plain 7324 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0ODQzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjRjMjQ0MzI0MzZlMTM1MGI2MzZjZTc0NWIxYzgzYmMz NDIzODlmYy4uMTRlZTc3MWZkN2M0MGRiNWMwZDIzZjgwYThiMjMwYTFmYmM5ZmM4NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM5 IEBACiAyMDEyLTAxLTEyICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHRlc3Qtd2Via2l0cHk6IHNob3VsZCBzdXBwb3J0IGNsYXNzZXMgYW5kIGluZGl2aWR1 YWwgdGVzdCBuYW1lcyBhcyB3ZWxsIGFzIG1vZHVsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2MjMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGRlZmF1bHQgdW5pdHRlc3QubWFpbigpIHN1cHBv cnRzIGEgbGlzdCBvZiBpbmRpdmlkdWFsCisgICAgICAgIFRlc3RDYXNlIGNsYXNzZXMgb3IgaW5k aXZpZHVhbCB0ZXN0cyBhcyB3ZWxsIGFzIG1vZHVsZXMuIFRoaXMKKyAgICAgICAgY2hhbmdlIGFk ZHMgc3VwcG9ydCBmb3IgdGhlIHNhbWUgdG8gdGVzdC13ZWJraXRweSwgc28gbm93IHlvdQorICAg ICAgICBjYW4gc2F5CisKKyAgICAgICAgICAlIHRlc3Qtd2VrYml0cHkgd2Via2l0cHkudGVzdC5j YXRfdW5pdHRlc3QuQ2F0VGVzdAorCisgICAgICAgIGFuZAorCisgICAgICAgICAgJSB0ZXN0LXdl a2JpdHB5IHdlYmtpdHB5LnRlc3QuY2F0X3VuaXR0ZXN0LkNhdFRlc3QudGVzdF9iYXNpYworCisg ICAgICAgIGluIGFkZGl0aW9uIHRvCisKKyAgICAgICAgICAlIHRlc3Qtd2VrYml0cHkgd2Via2l0 cHkudGVzdC5jYXRfdW5pdHRlc3QKKworICAgICAgICAqIFNjcmlwdHMvdGVzdC13ZWJraXRweToK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rlc3QvY2F0X3VuaXR0ZXN0LnB5OgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWluLnB5OgorICAgICAgICAoVGVzdGVyLnBhcnNl X2FyZ3MpOgorICAgICAgICAoVGVzdGVyLnJ1bik6CisgICAgICAgIChUZXN0ZXIpOgorICAgICAg ICAoVGVzdGVyLl9maW5kX21vZHVsZXMpOgorICAgICAgICAoVGVzdGVyLl9leGNsdWRlKToKKyAg ICAgICAgKFRlc3Rlci5fcnVuX3Rlc3RzKToKKyAgICAgICAgKFRlc3Rlci5faXNfbW9kdWxlKToK KyAgICAgICAgKFRlc3Rlci5fbG9nX2V4Y2VwdGlvbik6CisKKzIwMTItMDEtMTIgIERpcmsgUHJh bmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgd2Via2l0cHk6IGNsZWFuIHVw IHBvcnQgdW5pdCB0ZXN0cyBpbiBwcmVwYXJhdGlvbiBmb3IgbWFraW5nIHBvcnRfbmFtZSBtYW5k YXRvcnkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2 MTIzCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweSBiL1Rvb2xzL1Nj cmlwdHMvdGVzdC13ZWJraXRweQppbmRleCBmMDEyZDEyZWE1MGY0MjM3Mzk1NTg3ZmQ0NjNhZTQ0 YmI2YjgyMmI2Li42YzNkZTM5MDI0YTgzNTA3ZDM0NDFhN2Y5NTdhODZhODE2MTQyZTM2IDEwMDc1 NQotLS0gYS9Ub29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHkKKysrIGIvVG9vbHMvU2NyaXB0cy90 ZXN0LXdlYmtpdHB5CkBAIC02NSw1ICs2NSw0IEBAIGlmIF9fbmFtZV9fID09ICJfX21haW5fXyI6 CiAgICAgdGVzdGVyID0gbWFpbi5UZXN0ZXIoKQogICAgIG9wdGlvbnMsIGFyZ3MgPSB0ZXN0ZXIu cGFyc2VfYXJncyhzeXMuYXJndikKICAgICB0ZXN0ZXIuY29uZmlndXJlKG9wdGlvbnMpCi0gICAg bW9kdWxlcyA9IHRlc3Rlci5maW5kX21vZHVsZXMoZGlycywgYXJncykKLSAgICBzeXMuZXhpdChu b3QgdGVzdGVyLnJ1bl90ZXN0cyhtb2R1bGVzKSkKKyAgICBzeXMuZXhpdChub3QgdGVzdGVyLnJ1 bihkaXJzLCBhcmdzKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVzdC9j YXRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvY2F0X3VuaXR0ZXN0 LnB5CmluZGV4IDRlZDFmNjc5YTg0ODdhMGEzZDUxMzMwMGFhZjg2Yjc1Y2JlMmJhNjkuLjE5ZTFk NjI1OWJlYjcxNTc0YTQ4NmZkZWVkNWM2NDA1NTMyOThkNGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdGVzdC9jYXRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS90ZXN0L2NhdF91bml0dGVzdC5weQpAQCAtMjgsNyArMjgsNiBAQCBpbXBvcnQgdW5p dHRlc3QKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbSBpbXBvcnQgZXhlY3V0aXZlLCBvdXRw dXRjYXB0dXJlCiBmcm9tIHdlYmtpdHB5LnRlc3QgaW1wb3J0IGNhdAogCi0KIGNsYXNzIENhdFRl c3Qob3V0cHV0Y2FwdHVyZS5PdXRwdXRDYXB0dXJlVGVzdENhc2VCYXNlKToKICAgICBkZWYgYXNz ZXJ0X2NhdChzZWxmLCBpbnB1dCk6CiAgICAgICAgIHNhdmVkX3N0ZGluID0gc3lzLnN0ZGluCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvbWFpbi5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdGVzdC9tYWluLnB5CmluZGV4IDUzM2ZiNDU5YTA2OGY0YTQ1NzM2NDc4 MzQxZWMyMzk0ZjRiZDU1MGEuLmRhZmVhNDhlOTMzZjQ1MTQ3MjA3MjRlNjdhMjY3NzI1MjdlMTFl ODggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWluLnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWluLnB5CkBAIC0yNSw3ICsyNSw5IEBACiBp bXBvcnQgbG9nZ2luZwogaW1wb3J0IG9wdHBhcnNlCiBpbXBvcnQgb3MKK2ltcG9ydCBTdHJpbmdJ TwogaW1wb3J0IHN5cworaW1wb3J0IHRyYWNlYmFjawogaW1wb3J0IHVuaXR0ZXN0CiAKICMgTk9U RTogV2UgaW50ZW50aW9uYWxseSBkbyBub3QgZGVwZW5kIG9uIGFueXRoaW5nIGVsc2UgaW4gd2Vi a2l0cHkgaGVyZSB0byBhdm9pZCBicmVha2luZyB0ZXN0LXdlYmtpdHB5LgpAQCAtNTAsNyArNTIs NyBAQCBjbGFzcyBUZXN0ZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5fdmVyYm9zaXR5ID0gMQog CiAgICAgZGVmIHBhcnNlX2FyZ3Moc2VsZiwgYXJndik6Ci0gICAgICAgIHBhcnNlciA9IG9wdHBh cnNlLk9wdGlvblBhcnNlcih1c2FnZT0ndXNhZ2U6ICVwcm9nIFtvcHRpb25zXSBbbW9kdWxlcy4u Ll0nKQorICAgICAgICBwYXJzZXIgPSBvcHRwYXJzZS5PcHRpb25QYXJzZXIodXNhZ2U9J3VzYWdl OiAlcHJvZyBbb3B0aW9uc10gW2FyZ3MuLi5dJykKICAgICAgICAgcGFyc2VyLmFkZF9vcHRpb24o Jy1hJywgJy0tYWxsJywgYWN0aW9uPSdzdG9yZV90cnVlJywgZGVmYXVsdD1GYWxzZSwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgaGVscD0ncnVuIGFsbCB0aGUgdGVzdHMnKSwKICAgICAgICAg cGFyc2VyLmFkZF9vcHRpb24oJy1uJywgJy0tZHJ5cnVuJywgYWN0aW9uPSdzdG9yZV90cnVlJywg ZGVmYXVsdD1GYWxzZSwKQEAgLTY2LDYgKzY4LDkgQEAgY2xhc3MgVGVzdGVyKG9iamVjdCk6CiAg ICAgICAgIHBhcnNlci5hZGRfb3B0aW9uKCctLXNraXAtaW50ZWdyYXRpb250ZXN0cycsIGFjdGlv bj0nc3RvcmVfdHJ1ZScsIGRlZmF1bHQ9RmFsc2UsCiAgICAgICAgICAgICAgICAgICAgICAgICAg IGhlbHA9J2RvIG5vdCBydW4gdGhlIGludGVncmF0aW9uIHRlc3RzJykKIAorICAgICAgICBwYXJz ZXIuZXBpbG9nID0gKCdbYXJncy4uLl0gaXMgYW4gb3B0aW9uYWwgbGlzdCBvZiBtb2R1bGVzLCB0 ZXN0X2NsYXNzZXMsIG9yIGluZGl2aWR1YWwgdGVzdHMuICcKKyAgICAgICAgICAgICAgICAgICAg ICAgICAnSWYgbm8gYXJncyBhcmUgZ2l2ZW4sIGFsbCB0aGUgdGVzdHMgd2lsbCBiZSBydW4uJykK KwogICAgICAgICBzZWxmLnByb2dOYW1lID0gb3MucGF0aC5iYXNlbmFtZShhcmd2WzBdKQogICAg ICAgICByZXR1cm4gcGFyc2VyLnBhcnNlX2FyZ3MoYXJndlsxOl0pCiAKQEAgLTEzNiw3ICsxNDEs MTAgQEAgY2xhc3MgVGVzdGVyKG9iamVjdCk6CiAgICAgICAgIF9sb2cuaW5mbygiU3VwcHJlc3Np bmcgbW9zdCB3ZWJraXRweSBsb2dnaW5nIHdoaWxlIHJ1bm5pbmcgdW5pdCB0ZXN0cy4iKQogICAg ICAgICBoYW5kbGVyLmFkZEZpbHRlcih0ZXN0aW5nX2ZpbHRlcikKIAotICAgIGRlZiBmaW5kX21v ZHVsZXMoc2VsZiwgZGlycywgbW9kdWxlcyk6CisgICAgZGVmIHJ1bihzZWxmLCBkaXJzLCBhcmdz KToKKyAgICAgICAgcmV0dXJuIG5vdCBzZWxmLl9ydW5fdGVzdHMoZGlycywgc2VsZi5fZmluZF9t b2R1bGVzKGRpcnMsIGFyZ3MpKQorCisgICAgZGVmIF9maW5kX21vZHVsZXMoc2VsZiwgZGlycywg bW9kdWxlcyk6CiAgICAgICAgICMgRklYTUU6IFdlIHNob3VsZCBjb25zaWRlciBtb3Zpbmcgd2Vi a2l0cHkgb2ZmIG9mIHVzaW5nICJ3ZWJraXRweS4iIHRvIHByZWZpeAogICAgICAgICAjIGFsbCBp bmNsdWRlcy4gIElmIHdlIGRpZCB0aGF0LCB0aGVuIHRoaXMgd291bGQgdXNlIHBhdGggaW5zdGVh ZCBvZiBkaXJuYW1lKHBhdGgpLgogICAgICAgICAjIFF1ZXVlU3RhdHVzU2VydmVyLl9faW5pdF9f IGhhcyBhIHN5cy5wYXRoIGltcG9ydCBoYWNrIGR1ZSB0byB0aGlzIGNvZGUuCkBAIC0xNzgsNyAr MTg2LDYgQEAgY2xhc3MgVGVzdGVyKG9iamVjdCk6CiAgICAgICAgIF9sb2cuaW5mbygnICAgICho dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9JWQ7IHVzZSAtLWFsbCB0byBp bmNsdWRlKScgJSBidWdpZCkKICAgICAgICAgX2xvZy5pbmZvKCcnKQogCi0KICAgICBkZWYgX2Zp bmRfdW5kZXIoc2VsZiwgZGlyX3RvX3NlYXJjaCwgc3VmZml4KToKICAgICAgICAgcGF0aHMgPSBb XQogICAgICAgICBmb3IgZGlyX3BhdGgsIGRpcl9uYW1lcywgZmlsZV9uYW1lcyBpbiBvcy53YWxr KGRpcl90b19zZWFyY2gpOgpAQCAtMjE2LDE5ICsyMjMsMjcgQEAgY2xhc3MgVGVzdGVyKG9iamVj dCk6CiAKICAgICAgICAgcmV0dXJuIG1vZHVsZXMKIAotICAgIGRlZiBydW5fdGVzdHMoc2VsZiwg bW9kdWxlcyk6CisgICAgZGVmIF9ydW5fdGVzdHMoc2VsZiwgZGlycywgYXJncyk6CiAgICAgICAg ICMgRklYTUU6IGltcGxlbWVudCBhIG1vcmUgdXNlZnVsIGRyeXJ1biB0aGF0IHJlY3Vyc2VzIGlu dG8gdGhlIHRlc3Qgc3VpdGUuCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMuZHJ5cnVuOgogICAg ICAgICAgICAgcmV0dXJuIFRydWUKIAotICAgICAgICAjIHVuaXR0ZXN0IGhhcyBob3JyaWJsZSBl cnJvciByZXBvcnRpbmcgd2hlbiBtb2R1bGUgaW1wb3J0cyBhcmUgYmFkCi0gICAgICAgICMgc28g d2UgaW1wb3J0cyB0aGVtIGZpcnN0IHRvIG1ha2UgZGVidWdnaW5nIGJhZCBpbXBvcnRzIG11Y2gg ZWFzaWVyLgotICAgICAgICBfbG9nLmRlYnVnKCJJbXBvcnRpbmcgYWxsIHRoZSBtb2R1bGVzIHRv IGNoZWNrIGZvciBlcnJvcnMuIikKLSAgICAgICAgZm9yIG1vZHVsZSBpbiBtb2R1bGVzOgotICAg ICAgICAgICAgX19pbXBvcnRfXyhtb2R1bGUpCi0KLSAgICAgICAgX2xvZy5kZWJ1ZygiTG9hZGlu ZyB0aGUgdGVzdHMgaW4gdGhlIG1vZHVsZXMuIikKLSAgICAgICAgdGVzdF9zdWl0ZSA9IHVuaXR0 ZXN0LmRlZmF1bHRUZXN0TG9hZGVyLmxvYWRUZXN0c0Zyb21OYW1lcyhtb2R1bGVzLCBOb25lKQor ICAgICAgICBfbG9nLmRlYnVnKCJMb2FkaW5nIHRoZSB0ZXN0cy4uLiIpCisgICAgICAgIGxvYWRl ciA9IHVuaXR0ZXN0LmRlZmF1bHRUZXN0TG9hZGVyCisgICAgICAgIHN1aXRlcyA9IFtdCisgICAg ICAgIGZvciBuYW1lIGluIGFyZ3M6CisgICAgICAgICAgICBpZiBzZWxmLl9pc19tb2R1bGUoZGly cywgbmFtZSk6CisgICAgICAgICAgICAgICAgIyBpbXBvcnQgbW9kdWxlcyBleHBsaWNpdGx5IGJl Zm9yZSBsb2FkaW5nIHRoZWlyIHRlc3RzIGJlY2F1c2UKKyAgICAgICAgICAgICAgICAjIGxvYWRU ZXN0c0Zyb21OYW1lKCkgcHJvZHVjZXMgbG91c3kgZXJyb3IgbWVzc2FnZXMgZm9yIGJhZCBtb2R1 bGVzLgorICAgICAgICAgICAgICAgIHRyeToKKyAgICAgICAgICAgICAgICAgICAgX19pbXBvcnRf XyhuYW1lKQorICAgICAgICAgICAgICAgIGV4Y2VwdCBJbXBvcnRFcnJvciwgZToKKyAgICAgICAg ICAgICAgICAgICAgX2xvZy5mYXRhbCgnRmFpbGVkIHRvIGltcG9ydCAlczonICUgbmFtZSkKKyAg ICAgICAgICAgICAgICAgICAgc2VsZi5fbG9nX2V4Y2VwdGlvbigpCisgICAgICAgICAgICAgICAg ICAgIHJldHVybiBGYWxzZQorICAgICAgICAgICAgc3VpdGVzLmFwcGVuZChsb2FkZXIubG9hZFRl c3RzRnJvbU5hbWUobmFtZSwgTm9uZSkpCisKKyAgICAgICAgdGVzdF9zdWl0ZSA9IHVuaXR0ZXN0 LlRlc3RTdWl0ZShzdWl0ZXMpCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMueG1sOgogICAgICAg ICAgICAgZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQueG1scnVubmVyIGlt cG9ydCBYTUxUZXN0UnVubmVyCiAgICAgICAgICAgICB0ZXN0X3J1bm5lciA9IFhNTFRlc3RSdW5u ZXIob3V0cHV0PSd0ZXN0LXdlYmtpdHB5LXhtbC1yZXBvcnRzJykKQEAgLTIzNywzICsyNTIsMTgg QEAgY2xhc3MgVGVzdGVyKG9iamVjdCk6CiAKICAgICAgICAgX2xvZy5kZWJ1ZygiUnVubmluZyB0 aGUgdGVzdHMuIikKICAgICAgICAgcmV0dXJuIHRlc3RfcnVubmVyLnJ1bih0ZXN0X3N1aXRlKS53 YXNTdWNjZXNzZnVsKCkKKworICAgIGRlZiBfaXNfbW9kdWxlKHNlbGYsIGRpcnMsIG5hbWUpOgor ICAgICAgICByZWxwYXRoID0gbmFtZS5yZXBsYWNlKCcuJywgb3Muc2VwKSArICcucHknCisgICAg ICAgIGZvciBkIGluIGRpcnM6CisgICAgICAgICAgICAjIEZJWE1FOiB3ZSBuZWVkIHRvIHRha2Ug dGhlIHBhcmVudCBkaXJlY3Rvcnkgb2YgdGhlIGVhY2ggZGlyIGluIHRoZSBsaXN0CisgICAgICAg ICAgICAjIGluIG9yZGVyIHRvIHdvcmsgYXJvdW5kIHRoZSAnd2Via2l0cHknIGlzc3VlIG1lbnRp b25lZCBhYm92ZS4KKyAgICAgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKG9zLnBhdGguam9pbihv cy5wYXRoLmRpcm5hbWUoZCksIHJlbHBhdGgpKToKKyAgICAgICAgICAgICAgICByZXR1cm4gVHJ1 ZQorICAgICAgICByZXR1cm4gRmFsc2UKKworICAgIGRlZiBfbG9nX2V4Y2VwdGlvbihzZWxmKToK KyAgICAgICAgcyA9IFN0cmluZ0lPLlN0cmluZ0lPKCkKKyAgICAgICAgdHJhY2ViYWNrLnByaW50 X2V4YyhmaWxlPXMpCisgICAgICAgIGZvciBsIGluIHMuYnVmbGlzdDoKKyAgICAgICAgICAgIF9s b2cuZXJyb3IoJyAgJyArIGwucnN0cmlwKCkpCg==