64807 2011-07-19 09:22:58 -0700 Change behavior of expectation overrides to strictly override. 2011-08-03 11:09:39 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 64385 1 dglazkov dglazkov abarth dpranke oldest_to_newest 439199 0 dglazkov 2011-07-19 09:22:58 -0700 Change behavior of expectation overrides to strictly override. 439203 1 101331 dglazkov 2011-07-19 09:28:39 -0700 Created attachment 101331 Patch 439206 2 dglazkov 2011-07-19 09:31:30 -0700 Dirk, wanted you to see this. Even though it relaxes the grip of tidiness on the downstream test_expectations.txt, this division between "insert" and "update" will make for much more straightforward TestExpectationModel code. 439388 3 101331 dpranke 2011-07-19 13:11:14 -0700 Comment on attachment 101331 Patch Hm. I'm not convinced this is a win, since it will allow us to generate what would be (IMO) buggy overrides files that do contain duplicates that we wouldn't notice. Perhaps there is another way to do this, that would distinguish when you were parsing a block of updates that needed to be self-consistent from when you were updating entries one at a time, and you did want the last-one-wins behavior? 439504 4 abarth 2011-07-19 15:21:10 -0700 Sounds like we need more discussion here. 439529 5 dpranke 2011-07-19 15:54:54 -0700 Per further discussion w/ dimitri, I can see how if we create an object that manages the "view" (in the database sense, not the MVC sense) that can deal with lines as a set, we can pull this logic out of here. This change will potentially break things in the short term (since you can put overrides in with duplicates that won't be caught) but the risk of this seems low. 445952 6 101331 dglazkov 2011-08-03 11:08:53 -0700 Comment on attachment 101331 Patch Turns out I don't need this. 101331 2011-07-19 09:28:39 -0700 2011-08-03 11:08:53 -0700 Patch bug-64807-20110719092838.patch text/plain 6038 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogOTEyNTMKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhNTY2ZGM5NjYwMWI2MjQxNThmMWJiMDlhYWU1YmQ4OWE5 Mzc1MmYyLi42NTY1NzEwMTI3YWY1MjkwNjgxYTVkZDcyZmFiMjk0NDJkNWJmOTgxIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEg QEAKIDIwMTEtMDctMTkgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4K IAorICAgICAgICBDaGFuZ2UgYmVoYXZpb3Igb2YgZXhwZWN0YXRpb24gb3ZlcnJpZGVzIHRvIHN0 cmljdGx5IG92ZXJyaWRlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NjQ4MDcKKworICAgICAgICBIZXJlJ3MgYSBzbGlnaHQgY2hhbmdlIGluIGhvdyB3 ZSB0cmVhdCB0aGUgb3ZlcnJpZGluZyBleHBlY3RhdGlvbnMuIEZyb20gdGhpcyBwb2ludCBvbiwK KyAgICAgICAgdGhlcmUgYXJlIG5vIG1vcmUgY2hlY2tzIGZvciBkdXBsaWNhdGVzIGluIHRoZSBv dmVycmlkaW5nIGxvZ2ljLiBJbnN0ZWFkLCBpdCdzIGEgc2ltcGxlIGxhc3Qtb3ZlcnJpZGUtd2lu cy4KKyAgICAgICAgVGhpcyBhbGxvd3MgdXMgdG8gZHJhdyBhIGNsZWFyIGxpbmUgYmV0d2VlbiBp bnNlcnRpbmcgZXhwZWN0YXRpb25zIGludG8gdGhlIG1vZGVsIGFuZCB1cGRhdGluZyBleHBlY3Rh dGlvbnMgaW4gdGhlIG1vZGVsLgorICAgICAgICBUaGUgdGVzdF9leHBlY3RhdGlvbnMudHh0IGlz IHdoZXJlIGV4cGVjdGF0aW9ucyBhcmUgaW5zZXJ0ZWQgZnJvbSwgYW5kIHRoZSBvdmVycmlkZXMg YXJlIGp1c3QgdXBkYXRpbmcgZXhpc3RpbmcKKyAgICAgICAgbW9kZWwuCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHk6IFJlbW92ZWQgY2hlY2tpbmcg Zm9yIGR1cGxpY2F0ZXMgaW4gb3ZlcnJpZGVzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weTogQWRqdXN0 ZWQgdGhlIHRlc3RzIHRvIGxvb2sgZm9yIGxhc3Qtb3ZlcnJpZGUtd2lucyBiZWhhdmlvci4KKwor MjAxMS0wNy0xOSAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgorCiAg ICAgICAgIFN0b3JlIGxpbmUgbnVtYmVyIG9uIFRlc3RFeHBlY3RhdGlvbkxpbmUuCiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDgwMAogCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBl Y3RhdGlvbnMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMv dGVzdF9leHBlY3RhdGlvbnMucHkKaW5kZXggMjMwYWRlOTU5NWQyOWZiNWQ1OTc1OTM3NDQwZWRk YjExZjY2YTk2Yy4uN2EyNTZiMDg3MThmNTc0ZGY2MzNhNTA1Njk3Nzg4YzYyNTJkYmZmOCAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3Rf ZXhwZWN0YXRpb25zLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weQpAQCAtMzcyLDEzICszNzIsNiBAQCBjbGFzcyBU ZXN0RXhwZWN0YXRpb25zTW9kZWw6CiAgICAgICAgICMgTWFwcyBhIHRlc3QgdG8gYSBUZXN0RXhw ZWN0YXRpb25MaW5lIGluc3RhbmNlLgogICAgICAgICBzZWxmLl90ZXN0X3RvX2V4cGVjdGF0aW9u X2xpbmUgPSB7fQogCi0gICAgICAgICMgTGlzdCBvZiB0ZXN0cyB0aGF0IGFyZSBpbiB0aGUgb3Zl cnJpZGVzIGZpbGUgKHVzZWQgZm9yIGNoZWNraW5nIGZvcgotICAgICAgICAjIGR1cGxpY2F0ZXMg aW5zaWRlIHRoZSBvdmVycmlkZXMgZmlsZSBpdHNlbGYpLiBOb3RlIHRoYXQganVzdCBiZWNhdXNl Ci0gICAgICAgICMgYSB0ZXN0IGlzIGluIHRoaXMgc2V0IGRvZXNuJ3QgbWVhbiBpdCdzIG5lY2Vz c2FyaWx5IG92ZXJyaWRkaW5nIGEKLSAgICAgICAgIyBleHBlY3RhdGlvbiBpbiB0aGUgcmVndWxh ciBleHBlY3RhdGlvbnM7IHRoZSB0ZXN0IG1pZ2h0IG5vdCBiZQotICAgICAgICAjIG1lbnRpb25l ZCBpbiB0aGUgcmVndWxhciBleHBlY3RhdGlvbnMgZmlsZSBhdCBhbGwuCi0gICAgICAgIHNlbGYu X292ZXJyaWRkaW5nX3Rlc3RzID0gc2V0KCkKLQogICAgICAgICBzZWxmLl9tb2RpZmllcl90b190 ZXN0cyA9IHNlbGYuX2RpY3Rfb2Zfc2V0cyhUZXN0RXhwZWN0YXRpb25zLk1PRElGSUVSUykKICAg ICAgICAgc2VsZi5fZXhwZWN0YXRpb25fdG9fdGVzdHMgPSBzZWxmLl9kaWN0X29mX3NldHMoVGVz dEV4cGVjdGF0aW9ucy5FWFBFQ1RBVElPTlMpCiAgICAgICAgIHNlbGYuX3RpbWVsaW5lX3RvX3Rl c3RzID0gc2VsZi5fZGljdF9vZl9zZXRzKFRlc3RFeHBlY3RhdGlvbnMuVElNRUxJTkVTKQpAQCAt NDcyLDkgKzQ2NSw2IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnNNb2RlbDoKICAgICAgICAgZWxz ZToKICAgICAgICAgICAgIHNlbGYuX3Jlc3VsdF90eXBlX3RvX3Rlc3RzW0ZBSUxdLmFkZCh0ZXN0 KQogCi0gICAgICAgIGlmIG92ZXJyaWRlc19hbGxvd2VkOgotICAgICAgICAgICAgc2VsZi5fb3Zl cnJpZGRpbmdfdGVzdHMuYWRkKHRlc3QpCi0KICAgICBkZWYgX2NsZWFyX2V4cGVjdGF0aW9uc19m b3JfdGVzdChzZWxmLCB0ZXN0LCBleHBlY3RhdGlvbl9saW5lKToKICAgICAgICAgIiIiUmVtb3Zl IHByZXhpc3RpbmcgZXhwZWN0YXRpb25zIGZvciB0aGlzIHRlc3QuCiAgICAgICAgIFRoaXMgaGFw cGVucyBpZiB3ZSBhcmUgc2VlaW5nIGEgbW9yZSBwcmVjaXNlIHBhdGgKQEAgLTUyMCwyMCArNTEw LDE1IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnNNb2RlbDoKICAgICAgICAgICAgICMgVGhpcyBw YXRoIG1hdGNoZXMgbW9yZSBvZiB0aGUgdGVzdC4KICAgICAgICAgICAgIHJldHVybiBGYWxzZQog Ci0gICAgICAgIGlmIG92ZXJyaWRlc19hbGxvd2VkIGFuZCB0ZXN0IG5vdCBpbiBzZWxmLl9vdmVy cmlkZGluZ190ZXN0czoKKyAgICAgICAgaWYgb3ZlcnJpZGVzX2FsbG93ZWQ6CiAgICAgICAgICAg ICAjIFdlIGhhdmUgc2VlbiB0aGlzIHBhdGgsIGJ1dCB0aGF0J3Mgb2theSBiZWNhdXNlIGl0IGlz CiAgICAgICAgICAgICAjIGluIHRoZSBvdmVycmlkZXMgYW5kIHRoZSBlYXJsaWVyIHBhdGggd2Fz IGluIHRoZQotICAgICAgICAgICAgIyBleHBlY3RhdGlvbnMgKG5vdCB0aGUgb3ZlcnJpZGVzKS4K KyAgICAgICAgICAgICMgZXhwZWN0YXRpb25zLgogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAK ICAgICAgICAgIyBBdCB0aGlzIHBvaW50IHdlIGtub3cgd2UgaGF2ZSBzZWVuIGEgcHJldmlvdXMg ZXhhY3QgbWF0Y2ggb24gdGhpcwogICAgICAgICAjIGJhc2UgcGF0aCwgc28gd2UgbmVlZCB0byBj aGVjayB0aGUgdHdvIHNldHMgb2YgbW9kaWZpZXJzLgogCi0gICAgICAgIGlmIG92ZXJyaWRlc19h bGxvd2VkOgotICAgICAgICAgICAgZXhwZWN0YXRpb25fc291cmNlID0gIm92ZXJyaWRlIgotICAg ICAgICBlbHNlOgotICAgICAgICAgICAgZXhwZWN0YXRpb25fc291cmNlID0gImV4cGVjdGF0aW9u IgotCiAgICAgICAgICMgRklYTUU6IFRoaXMgY29kZSB3YXMgb3JpZ2luYWxseSBkZXNpZ25lZCB0 byBhbGxvdyBsaW5lcyB0aGF0IG1hdGNoZWQKICAgICAgICAgIyBtb3JlIG1vZGlmaWVycyB0byBv dmVycmlkZSBsaW5lcyB0aGF0IG1hdGNoZWQgZmV3ZXIgbW9kaWZpZXJzLgogICAgICAgICAjIEhv d2V2ZXIsIHdlIGN1cnJlbnRseSB2aWV3IHRoZXNlIGFzIGVycm9ycy4gSWYgd2UgZGVjaWRlIHRv IG1ha2UKQEAgLTU0NCw3ICs1MjksNyBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25zTW9kZWw6CiAg ICAgICAgICMgdG8gYmUgd2FybmluZ3MgYW5kIHJldHVybiBGYWxzZSIuCiAKICAgICAgICAgaWYg cHJldl9leHBlY3RhdGlvbl9saW5lLnNwZWNpZmljaXR5ID09IGV4cGVjdGF0aW9uX2xpbmUuc3Bl Y2lmaWNpdHk6Ci0gICAgICAgICAgICBleHBlY3RhdGlvbl9saW5lLmVycm9ycy5hcHBlbmQoJ0R1 cGxpY2F0ZSBvciBhbWJpZ3VvdXMgJXMuJyAlIGV4cGVjdGF0aW9uX3NvdXJjZSkKKyAgICAgICAg ICAgIGV4cGVjdGF0aW9uX2xpbmUuZXJyb3JzLmFwcGVuZCgnRHVwbGljYXRlIG9yIGFtYmlndW91 cyBleHBlY3RhdGlvbi4nKQogICAgICAgICAgICAgcmV0dXJuIFRydWUKIAogICAgICAgICBpZiBw cmV2X2V4cGVjdGF0aW9uX2xpbmUuc3BlY2lmaWNpdHkgPCBleHBlY3RhdGlvbl9saW5lLnNwZWNp ZmljaXR5OgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv bW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5Cmlu ZGV4IDUzZDkwZTQ0N2UxOWZkODIyMWM3MjA3ODRjZWE3NDY4ZGUzMTllMGYuLjdkNmIxYjhhZmNm MzQ2MDU1YjQxNTY0MDQ2ZDMxMzZjODk5YWYwMzcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9l eHBlY3RhdGlvbnNfdW5pdHRlc3QucHkKQEAgLTIxNiwxMiArMjE2LDEyIEBAIFNLSVAgOiBmYWls dXJlcy9leHBlY3RlZC9pbWFnZS5odG1sIiIiKQogICAgICAgICBzZWxmLmFzc2VydF9leHAoJ2Zh aWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCcsIElNQUdFKQogCiAgICAgZGVmIHRlc3Rfb3ZlcnJp ZGVzX19kdXBsaWNhdGUoc2VsZik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKFBhcnNlRXJy b3IsIHNlbGYucGFyc2VfZXhwLAotICAgICAgICAgICAgICJCVUdfRVhQOiBmYWlsdXJlcy9leHBl Y3RlZC90ZXh0Lmh0bWwgPSBURVhUIiwKKyAgICAgICAgc2VsZi5wYXJzZV9leHAoIkJVR19FWFA6 IGZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCA9IFRFWFQiLAogICAgICAgICAgICAgICIiIgog QlVHX09WRVJSSURFIDogZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1sID0gSU1BR0UKIEJVR19P VkVSUklERSA6IGZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCA9IENSQVNICiAiIiIpCisgICAg ICAgIHNlbGYuYXNzZXJ0X2V4cCgnZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1sJywgQ1JBU0gp CiAKICAgICBkZWYgdGVzdF9waXhlbF90ZXN0c19mbGFnKHNlbGYpOgogICAgICAgICBkZWYgbWF0 Y2godGVzdCwgcmVzdWx0LCBwaXhlbF90ZXN0c19lbmFibGVkKToKQEAgLTMwNSwxMCArMzA1LDEw IEBAIGNsYXNzIFNlbWFudGljVGVzdHMoQmFzZSk6CiBCVUdfRVhQIDogZmFpbHVyZXMvZXhwZWN0 ZWQvdGV4dC5odG1sID0gVEVYVAogQlVHX0VYUCA6IGZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRt bCA9IElNQUdFIiIiKQogCi0gICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKFBhcnNlRXJyb3IsIHNl bGYucGFyc2VfZXhwLAotICAgICAgICAgICAgc2VsZi5nZXRfYmFzaWNfZXhwZWN0YXRpb25zKCks IG92ZXJyaWRlcz0iIiIKKyAgICAgICAgc2VsZi5wYXJzZV9leHAoc2VsZi5nZXRfYmFzaWNfZXhw ZWN0YXRpb25zKCksIG92ZXJyaWRlcz0iIiIKIEJVR19PVkVSUklERSA6IGZhaWx1cmVzL2V4cGVj dGVkL3RleHQuaHRtbCA9IFRFWFQKIEJVR19PVkVSUklERSA6IGZhaWx1cmVzL2V4cGVjdGVkL3Rl eHQuaHRtbCA9IElNQUdFIiIiLCApCisgICAgICAgIHNlbGYuYXNzZXJ0X2V4cCgnZmFpbHVyZXMv ZXhwZWN0ZWQvdGV4dC5odG1sJywgSU1BR0UpCiAKICAgICBkZWYgdGVzdF9taXNzaW5nX2ZpbGUo c2VsZik6CiAgICAgICAgICMgVGhpcyBzaG91bGQgbG9nIGEgbm9uLWZhdGFsIGVycm9yLgo=