53356 2011-01-28 16:56:31 -0800 test-webkitpy: fix webkitpy.layout_tests.port.mac_unittest.MacTest.test_skipped_file_paths 2011-01-28 18:08:24 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth eric mihaip ojan tony oldest_to_newest 341867 0 dpranke 2011-01-28 16:56:31 -0800 test-webkitpy: fix webkitpy.layout_tests.port.mac_unittest.MacTest.test_skipped_file_paths 341869 1 80526 dpranke 2011-01-28 16:57:17 -0800 Created attachment 80526 Patch 341879 2 dpranke 2011-01-28 17:01:27 -0800 This is one way to fix the test that adam disabled in r76428. It takes the approach that this is a platform-dependent "integration test" and will work correctly for the version of the Mac it is running on. An alternative would be to rewrite this test to be version-independent and simply compare against what we think the list of skipped files is supposed to be for whatever versions we wish to support. I don't have a strong leaning either way. Thoughts? 341890 3 80526 mihaip 2011-01-28 17:31:16 -0800 Comment on attachment 80526 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=80526&action=review > Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py:46 > # FIXME: This test does not appear to be correct. It seems to receive Should remove this comment. > Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py:60 > + expected_paths.append('/LayoutTests/platform/mac' + port.version() + '/Skipped') Assuming that we had complex fallback logic (e.g. mac-snowleopard falls back on mac-leopard, but mac-leopard doesn't fall back mac-tiger), then it seems like we'd want to force port.version() to fixed value(s), so that we could get full coverage of those combinations regardless of what platform the test is run on. However, we don't actually have complex fallback logic. Still, I think overriding version() is the way to go. 341903 4 80532 dpranke 2011-01-28 17:54:05 -0800 Created attachment 80532 make version-independent per review feedback from mihaip 341904 5 dpranke 2011-01-28 17:54:50 -0800 (In reply to comment #3) > Still, I think overriding version() is the way to go. Ok. 341906 6 80532 mihaip 2011-01-28 17:56:10 -0800 Comment on attachment 80532 make version-independent per review feedback from mihaip View in context: https://bugs.webkit.org/attachment.cgi?id=80532&action=review > Tools/ChangeLog:8 > + handles the version of the platform it is running on correctly. ChangeLog should be updated since the platform that it's running on no longer matters. 341913 7 dpranke 2011-01-28 18:08:24 -0800 Committed r77039: <http://trac.webkit.org/changeset/77039> 80526 2011-01-28 16:57:17 -0800 2011-01-28 17:54:02 -0800 Patch bug-53356-20110128165716.patch text/plain 2455 dpranke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlZTkx Yzg4MmQzMjg1NzJiYTAyMzRlNzMzNTFjNmU5NTYwNmU5MmRlLi4zMzYwNTkzMzQ4NDY1ZmQ0NjMy MjNlYWZlOTYzOTY3NzNjNDNjNTRlIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTEtMDEtMjggIERpcmsgUHJhbmtl ICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgdGVzdC13ZWJraXRweTogZml4IHdlYmtpdHB5LmxheW91dF90ZXN0 cy5wb3J0Lm1hY191bml0dGVzdC5NYWNUZXN0LnRlc3Rfc2tpcHBlZF9maWxlX3BhdGhzCisKKyAg ICAgICAgVGhpcyBwYXRjaCByZS1lbmFibGVzIHRoaXMgdGVzdCBhbmQgbWFrZXMgc3VyZSBpdCBp cworICAgICAgICBoYW5kbGVzIHRoZSB2ZXJzaW9uIG9mIHRoZSBwbGF0Zm9ybSBpdCBpcyBydW5u aW5nIG9uIGNvcnJlY3RseS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTMzNTYKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5OgorCisyMDExLTAxLTI4ICBEaXJrIFByYW5rZSAgPGRw cmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFVucmV2aWV3ZWQsIGJ1aWxkIGZpeC4KIAog ICAgICAgICBXb3JrIGFyb3VuZCBicmVha2FnZSBvbiBXaW4gNyBSZWxlYXNlIGJvdCBjYXVzZWQg Ynkgcjc2OTgyCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L21hY191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5CmluZGV4IDE4YmE0MTQ1ZmFlZjc3MzM2YzYwMGZkY2Rk M2U0YmYxZjQ1MTUwZDguLmYxOWY5NDM0MWY2MjdlNTMzYjcyOTViNjlkZGNlZWYyMTY2ZTYyMzkg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFj X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvbWFjX3VuaXR0ZXN0LnB5CkBAIC00Niw3ICs0Niw3IEBAIGNsYXNzIE1hY1Rlc3QocG9ydF90 ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgICMgRklYTUU6IFRoaXMgdGVzdCBkb2VzIG5vdCBh cHBlYXIgdG8gYmUgY29ycmVjdC4gSXQgc2VlbXMgdG8gcmVjZWl2ZQogICAgICMgZGlmZmVyZW50 IGFuc3dlcnMgb24gZGlmZmVyZW50IHBsYXRmb3Jtcy4gV2Ugc2hvdWxkIGNvbnNpZGVyIHJlLWVu YWJsaW5nCiAgICAgIyBpdCBvbmNlIHdlJ3ZlIHdvcmtlZCBvdXQgaG93IHRvIG1ha2UgaXQgY29y cmVjdC4KLSAgICBkZWYgZGlzYWJsZWRfdGVzdF9za2lwcGVkX2ZpbGVfcGF0aHMoc2VsZik6Cisg ICAgZGVmIHRlc3Rfc2tpcHBlZF9maWxlX3BhdGhzKHNlbGYpOgogICAgICAgICBwb3J0ID0gc2Vs Zi5tYWtlX3BvcnQoKQogICAgICAgICBpZiBub3QgcG9ydDoKICAgICAgICAgICAgIHJldHVybgpA QCAtNTQsNyArNTQsMTIgQEAgY2xhc3MgTWFjVGVzdChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2Fz ZSk6CiAgICAgICAgICMgRklYTUU6IF9za2lwcGVkX2ZpbGVfcGF0aHMgc2hvdWxkIHJldHVybiBX ZWJLaXQtcmVsYXRpdmUgcGF0aHMuCiAgICAgICAgICMgU28gdG8gbWFrZSBpdCB1bml0IHRlc3Rh YmxlLCB3ZSBzdHJpcCB0aGUgV2ViS2l0IGRpcmVjdG9yeSBmcm9tIHRoZSBwYXRoLgogICAgICAg ICByZWxhdGl2ZV9wYXRocyA9IFtwYXRoW2xlbihwb3J0LnBhdGhfZnJvbV93ZWJraXRfYmFzZSgp KTpdIGZvciBwYXRoIGluIHNraXBwZWRfcGF0aHNdCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo cmVsYXRpdmVfcGF0aHMsIFsnTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLWxlb3BhcmQvU2tpcHBl ZCcsICdMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZCddKQorCisgICAgICAgIGV4cGVj dGVkX3BhdGhzID0gW10KKyAgICAgICAgaWYgcG9ydC52ZXJzaW9uKCk6CisgICAgICAgICAgICBl eHBlY3RlZF9wYXRocy5hcHBlbmQoJy9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMnICsgcG9ydC52 ZXJzaW9uKCkgKyAnL1NraXBwZWQnKQorICAgICAgICBleHBlY3RlZF9wYXRocy5hcHBlbmQoJy9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWxzKHJlbGF0aXZlX3BhdGhzLCBleHBlY3RlZF9wYXRocykKIAogICAgIGV4YW1wbGVfc2tpcHBl ZF9maWxlID0gdSIiIgogIyA8cmRhcjovL3Byb2JsZW0vNTY0Nzk1Mj4gZmFzdC9ldmVudHMvbW91 c2VvdXQtb24td2luZG93Lmh0bWwgbmVlZHMgbWFjIERSVCB0byBpc3N1ZSBtb3VzZSBvdXQgZXZl bnRzCg== 80532 2011-01-28 17:54:05 -0800 2011-01-28 17:56:10 -0800 make version-independent per review feedback from mihaip bug-53356-20110128175404.patch text/plain 3225 dpranke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlZTkx Yzg4MmQzMjg1NzJiYTAyMzRlNzMzNTFjNmU5NTYwNmU5MmRlLi42YWMzYmY2NGViNjRmZDE3MDg3 MzZjNjFkNGQ1ZTIxMWZlN2Q0YjMyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDQgKzEsMTcgQEAKIDIwMTEtMDEtMjggIERpcmsgUHJhbmtl ICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisgCisgICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKyAKKyAgICAgICAgIHRlc3Qtd2Via2l0cHk6IGZpeCB3ZWJraXRweS5sYXlvdXRf dGVzdHMucG9ydC5tYWNfdW5pdHRlc3QuTWFjVGVzdC50ZXN0X3NraXBwZWRfZmlsZV9wYXRocwor IAorICAgICAgICAgVGhpcyBwYXRjaCByZS1lbmFibGVzIHRoaXMgdGVzdCBhbmQgbWFrZXMgc3Vy ZSBpdCBpcworICAgICAgICAgaGFuZGxlcyB0aGUgdmVyc2lvbiBvZiB0aGUgcGxhdGZvcm0gaXQg aXMgcnVubmluZyBvbiBjb3JyZWN0bHkuCisgCisgICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTMzNTYKKyAKKyAgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9tYWNfdW5pdHRlc3QucHk6CisgCisyMDExLTAxLTI4ICBEaXJr IFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIGJ1 aWxkIGZpeC4KIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9tYWNfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L21hY191bml0dGVzdC5weQppbmRleCAxOGJhNDE0NWZhZWY3NzMzNmM2MDBmZGNk ZDNlNGJmMWY0NTE1MGQ4Li5lZjA0Njc5N2E0ZDNhNjU0MzI3YmI5YmQ4YzM2OGM2ZmYwNDcwYzJk IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21h Y191bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L21hY191bml0dGVzdC5weQpAQCAtMzUsMjYgKzM1LDMxIEBAIGltcG9ydCBwb3J0X3Rlc3Rj YXNlCiAKIAogY2xhc3MgTWFjVGVzdChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZSk6Ci0gICAg ZGVmIG1ha2VfcG9ydChzZWxmLCBvcHRpb25zPXBvcnRfdGVzdGNhc2UubW9ja19vcHRpb25zKToK KyAgICBkZWYgbWFrZV9wb3J0KHNlbGYsIHBvcnRfbmFtZT1Ob25lLCBvcHRpb25zPXBvcnRfdGVz dGNhc2UubW9ja19vcHRpb25zKToKICAgICAgICAgaWYgc3lzLnBsYXRmb3JtICE9ICdkYXJ3aW4n OgogICAgICAgICAgICAgcmV0dXJuIE5vbmUKLSAgICAgICAgcG9ydF9vYmogPSBtYWMuTWFjUG9y dChvcHRpb25zPW9wdGlvbnMpCisgICAgICAgIHBvcnRfb2JqID0gbWFjLk1hY1BvcnQocG9ydF9u YW1lPXBvcnRfbmFtZSwgb3B0aW9ucz1vcHRpb25zKQogICAgICAgICBwb3J0X29iai5fb3B0aW9u cy5yZXN1bHRzX2RpcmVjdG9yeSA9IHBvcnRfb2JqLnJlc3VsdHNfZGlyZWN0b3J5KCkKICAgICAg ICAgcG9ydF9vYmouX29wdGlvbnMuY29uZmlndXJhdGlvbiA9ICdSZWxlYXNlJwogICAgICAgICBy ZXR1cm4gcG9ydF9vYmoKIAotICAgICMgRklYTUU6IFRoaXMgdGVzdCBkb2VzIG5vdCBhcHBlYXIg dG8gYmUgY29ycmVjdC4gSXQgc2VlbXMgdG8gcmVjZWl2ZQotICAgICMgZGlmZmVyZW50IGFuc3dl cnMgb24gZGlmZmVyZW50IHBsYXRmb3Jtcy4gV2Ugc2hvdWxkIGNvbnNpZGVyIHJlLWVuYWJsaW5n Ci0gICAgIyBpdCBvbmNlIHdlJ3ZlIHdvcmtlZCBvdXQgaG93IHRvIG1ha2UgaXQgY29ycmVjdC4K LSAgICBkZWYgZGlzYWJsZWRfdGVzdF9za2lwcGVkX2ZpbGVfcGF0aHMoc2VsZik6Ci0gICAgICAg IHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCisgICAgZGVmIGFzc2VydF9za2lwcGVkX2ZpbGVzX2Zv cl92ZXJzaW9uKHNlbGYsIHBvcnRfbmFtZSwgZXhwZWN0ZWRfcGF0aHMpOgorICAgICAgICBwb3J0 ID0gc2VsZi5tYWtlX3BvcnQocG9ydF9uYW1lKQogICAgICAgICBpZiBub3QgcG9ydDoKICAgICAg ICAgICAgIHJldHVybgogICAgICAgICBza2lwcGVkX3BhdGhzID0gcG9ydC5fc2tpcHBlZF9maWxl X3BhdGhzKCkKICAgICAgICAgIyBGSVhNRTogX3NraXBwZWRfZmlsZV9wYXRocyBzaG91bGQgcmV0 dXJuIFdlYktpdC1yZWxhdGl2ZSBwYXRocy4KICAgICAgICAgIyBTbyB0byBtYWtlIGl0IHVuaXQg dGVzdGFibGUsIHdlIHN0cmlwIHRoZSBXZWJLaXQgZGlyZWN0b3J5IGZyb20gdGhlIHBhdGguCiAg ICAgICAgIHJlbGF0aXZlX3BhdGhzID0gW3BhdGhbbGVuKHBvcnQucGF0aF9mcm9tX3dlYmtpdF9i YXNlKCkpOl0gZm9yIHBhdGggaW4gc2tpcHBlZF9wYXRoc10KLSAgICAgICAgc2VsZi5hc3NlcnRF cXVhbChyZWxhdGl2ZV9wYXRocywgWydMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtbGVvcGFyZC9T a2lwcGVkJywgJ0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9Ta2lwcGVkJ10pCisgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwocmVsYXRpdmVfcGF0aHMsIGV4cGVjdGVkX3BhdGhzKQorCisgICAgZGVm IHRlc3Rfc2tpcHBlZF9maWxlX3BhdGhzKHNlbGYpOgorICAgICAgICBzZWxmLmFzc2VydF9za2lw cGVkX2ZpbGVzX2Zvcl92ZXJzaW9uKCdtYWMnLAorICAgICAgICAgICAgWycvTGF5b3V0VGVzdHMv cGxhdGZvcm0vbWFjL1NraXBwZWQnXSkKKyAgICAgICAgc2VsZi5hc3NlcnRfc2tpcHBlZF9maWxl c19mb3JfdmVyc2lvbignbWFjLXNub3dsZW9wYXJkJywKKyAgICAgICAgICAgIFsnL0xheW91dFRl c3RzL3BsYXRmb3JtL21hYy1zbm93bGVvcGFyZC9Ta2lwcGVkJywgJy9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMvU2tpcHBlZCddKQorICAgICAgICBzZWxmLmFzc2VydF9za2lwcGVkX2ZpbGVzX2Zv cl92ZXJzaW9uKCdtYWMtbGVvcGFyZCcsCisgICAgICAgICAgICBbJy9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMtbGVvcGFyZC9Ta2lwcGVkJywgJy9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tp cHBlZCddKQogCiAgICAgZXhhbXBsZV9za2lwcGVkX2ZpbGUgPSB1IiIiCiAjIDxyZGFyOi8vcHJv YmxlbS81NjQ3OTUyPiBmYXN0L2V2ZW50cy9tb3VzZW91dC1vbi13aW5kb3cuaHRtbCBuZWVkcyBt YWMgRFJUIHRvIGlzc3VlIG1vdXNlIG91dCBldmVudHMK