59269 2011-04-22 19:49:20 -0700 JSONTestResult needs to handle multiple results 2011-05-01 23:15:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 59272 1 abarth abarth commit-queue dpranke eric ojan oldest_to_newest 391342 0 abarth 2011-04-22 19:49:20 -0700 JSONTestResult needs to handle multiple results 391343 1 90832 abarth 2011-04-22 19:50:23 -0700 Created attachment 90832 Patch 391363 2 90837 abarth 2011-04-22 20:24:45 -0700 Created attachment 90837 Patch 391368 3 eric 2011-04-22 20:36:07 -0700 So this is unfortunate. My first version of my patch had support like this... until I asked Ojan if "actual" would ever have multiple values and he said "no". :( 391370 4 90837 eric 2011-04-22 20:37:34 -0700 Comment on attachment 90837 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90837&action=review > Tools/Scripts/webkitpy/common/net/resultsjsonparser.py:54 > def _actual_as_expectation(self): Seems this should be actual_as_expectations now. > Tools/Scripts/webkitpy/common/net/resultsjsonparser.py:56 > + return map(test_expectations.TestExpectations.expectation_from_string, actual_results.split(' ')) This will end up putting None in the array if the mapping fails. Seems we should detect that case and warn. > Tools/Scripts/webkitpy/common/net/resultsjsonparser_unittest.py:61 > + "actual": "PASS TEXT", What does this even mean? 391375 5 90837 ojan 2011-04-22 20:45:36 -0700 Comment on attachment 90837 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90837&action=review AFAIK, we don't ever put two results for actual in right now. We should though. We just don't right now. It's an easy change to summarize_results to start doing so, so I think supporting this is a good idea. >> Tools/Scripts/webkitpy/common/net/resultsjsonparser_unittest.py:61 >> + "actual": "PASS TEXT", > > What does this even mean? This means it passed during one one and failed text during another. 391377 6 eric 2011-04-22 20:46:43 -0700 Adam must be seeing these results or he wouldn't have added the support, or? 391380 7 eric 2011-04-22 20:48:01 -0700 So if we run new-run-webkit-tests foo.html --iterations 100, we'll get 100 values in 'actual'? Seems currently we'd never see "PASS" before a second result. 391383 8 abarth 2011-04-22 20:51:06 -0700 (In reply to comment #6) > Adam must be seeing these results or he wouldn't have added the support, or? Yes. I ran into this assert while testing the new hotness. 391384 9 ojan 2011-04-22 20:53:40 -0700 (In reply to comment #8) > (In reply to comment #6) > > Adam must be seeing these results or he wouldn't have added the support, or? > > Yes. I ran into this assert while testing the new hotness. Oh crap. I was just wrong. Sorry for the misinformation. I didn't believe it, but I just went and reread the code and we do in fact do this already. Whoops! 392873 10 dpranke 2011-04-26 15:49:35 -0700 patch LGTM. 393233 11 90837 eric 2011-04-26 18:27:04 -0700 Comment on attachment 90837 Patch r- per my comments above. This just needs one round of cleanup. 396234 12 91884 abarth 2011-05-01 22:42:04 -0700 Created attachment 91884 Patch 396240 13 91884 eric 2011-05-01 22:52:43 -0700 Comment on attachment 91884 Patch OK. 396246 14 91884 commit-queue 2011-05-01 23:15:08 -0700 Comment on attachment 91884 Patch Clearing flags on attachment: 91884 Committed r85459: <http://trac.webkit.org/changeset/85459> 396247 15 commit-queue 2011-05-01 23:15:13 -0700 All reviewed patches have been landed. Closing bug. 90832 2011-04-22 19:50:23 -0700 2011-04-22 20:24:38 -0700 Patch bug-59269-20110422195021.patch text/plain 3651 abarth SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDg0NzI4KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTYgQEAKKzIwMTEtMDQtMjIgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBKU09OVGVzdFJl c3VsdCBuZWVkcyB0byBoYW5kbGUgbXVsdGlwbGUgcmVzdWx0cworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTkyNjkKKworICAgICAgICBUaGlzIGNhc2Ug b2NjdXJzIHdoZW4gYSB0ZXN0IGlzIGZsYWt5IGJlY2F1c2UgTlJXVCB3aWxsIHJ1biB0aGUgdGVz dAorICAgICAgICB0d2ljZSBhbmQgcmVwb3J0IGJvdGggcmVzdWx0cyBhcyAiYWN0dWFsLiIKKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9yZXN1bHRzanNvbnBhcnNlci5w eToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvcmVzdWx0c2pzb25wYXJz ZXJfdW5pdHRlc3QucHk6CisKIDIwMTEtMDQtMjIgIElseWEgU2hlcm1hbiAgPGlzaGVybWFuQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292LgpJ bmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L3Jlc3VsdHNqc29ucGFyc2Vy LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9yZXN1 bHRzanNvbnBhcnNlci5weQkocmV2aXNpb24gODQ2NTUpCisrKyBUb29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9uZXQvcmVzdWx0c2pzb25wYXJzZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTQ5 LDE2ICs0OSwxMyBAQCBjbGFzcyBKU09OVGVzdFJlc3VsdChvYmplY3QpOgogICAgICAgICByZXR1 cm4gc2VsZi5fcmVzdWx0X2RpY3QuZ2V0KCd0aW1lX21zJykKIAogICAgIGRlZiBkaWRfcGFzcyhz ZWxmKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX2FjdHVhbF9hc19leHBlY3RhdGlvbigpID09IHRl c3RfZXhwZWN0YXRpb25zLlBBU1MKKyAgICAgICAgcmV0dXJuIHRlc3RfZXhwZWN0YXRpb25zLlBB U1MgaW4gc2VsZi5fYWN0dWFsX2FzX2V4cGVjdGF0aW9uKCkKIAogICAgIGRlZiBfYWN0dWFsX2Fz X2V4cGVjdGF0aW9uKHNlbGYpOgotICAgICAgICBhY3R1YWxfcmVzdWx0ID0gc2VsZi5fcmVzdWx0 X2RpY3RbJ2FjdHVhbCddCi0gICAgICAgICMgVGhlcmUgc2hvdWxkIGFsd2F5cyBiZSBvbmx5IG9u ZSBleHBlY3RhdGlvbiBmb3IgYWN0dWFsCi0gICAgICAgIGFzc2VydCgnICcgbm90IGluIGFjdHVh bF9yZXN1bHQpCi0gICAgICAgIHJldHVybiB0ZXN0X2V4cGVjdGF0aW9ucy5UZXN0RXhwZWN0YXRp b25zLmV4cGVjdGF0aW9uX2Zyb21fc3RyaW5nKGFjdHVhbF9yZXN1bHQpCisgICAgICAgIGFjdHVh bF9yZXN1bHRzID0gc2VsZi5fcmVzdWx0X2RpY3RbJ2FjdHVhbCddCisgICAgICAgIHJldHVybiBt YXAodGVzdF9leHBlY3RhdGlvbnMuVGVzdEV4cGVjdGF0aW9ucy5leHBlY3RhdGlvbl9mcm9tX3N0 cmluZywgYWN0dWFsX3Jlc3VsdHMuc3BsaXQoJyAnKSkKIAotICAgIGRlZiBfZmFpbHVyZXMoc2Vs Zik6Ci0gICAgICAgIGFjdHVhbCA9IHNlbGYuX2FjdHVhbF9hc19leHBlY3RhdGlvbigpCisgICAg ZGVmIF9mYWlsdXJlX3R5cGVzX2Zyb21fYWN0dWFsX3Jlc3VsdChzZWxmLCBhY3R1YWwpOgogICAg ICAgICAjIEZJWE1FOiBUaGVyZSBkb2Vzbid0IHNlZW0gdG8gYmUgYSBmdWxsIGxpc3Qgb2YgYWxs IHBvc3NpYmxlIHZhbHVlcyBvZgogICAgICAgICAjICdhY3R1YWwnIGFueXdoZXJlLiAgSG93ZXZl ciBKU09OTGF5b3V0UmVzdWx0c0dlbmVyYXRvci5GQUlMVVJFX1RPX0NIQVIKICAgICAgICAgIyBp cyBhIHVzZWZ1bCByZWZlcmVuY2UgYXMgdGhhdCdzIGZvciAib2xkIiBzdHlsZSByZXN1bHRzLmpz b24gZmlsZXMKQEAgLTgyLDYgKzc5LDExIEBAIGNsYXNzIEpTT05UZXN0UmVzdWx0KG9iamVjdCk6 CiAgICAgICAgICAgICBsb2coIkZhaWxlZCB0byBoYW5kbGU6ICVzIiAlIHNlbGYuX3Jlc3VsdF9k aWN0WydhY3R1YWwnXSkKICAgICAgICAgICAgIHJldHVybiBbXQogCisgICAgZGVmIF9mYWlsdXJl cyhzZWxmKToKKyAgICAgICAgaWYgc2VsZi5kaWRfcGFzcygpOgorICAgICAgICAgICAgcmV0dXJu IFtdCisgICAgICAgIHJldHVybiBzdW0obWFwKHNlbGYuX2ZhaWx1cmVfdHlwZXNfZnJvbV9hY3R1 YWxfcmVzdWx0LCBzZWxmLl9hY3R1YWxfYXNfZXhwZWN0YXRpb24oKSksIFtdKQorCiAgICAgZGVm IHRlc3RfcmVzdWx0KHNlbGYpOgogICAgICAgICByZXR1cm4gdGVzdF9yZXN1bHRzLlRlc3RSZXN1 bHQoc2VsZi5fdGVzdF9uYW1lLCBzZWxmLl9mYWlsdXJlcygpLCB0ZXN0X3J1bl90aW1lPXNlbGYu dGVzdF9ydW50aW1lKCkpCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25l dC9yZXN1bHRzanNvbnBhcnNlcl91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvcmVzdWx0c2pzb25wYXJzZXJfdW5pdHRlc3QucHkJKHJl dmlzaW9uIDg0NjU1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L3Jlc3Vs dHNqc29ucGFyc2VyX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0OCwyNCBA QCBjbGFzcyBSZXN1bHRzSlNPTlBhcnNlclRlc3QodW5pdHRlc3QuVGVzCiAgICAgICAgICAgICAi dGltZV9tcyI6IDExMCwKICAgICAgICAgICAgICJhY3R1YWwiOiAiSU1BR0UiLAogICAgICAgICAg ICAgImhhc19zdGRlcnIiOiBmYWxzZQorICAgICAgICB9LAorICAgICAgICAiZmFzdFwvZG9tXC9w cm90b3R5cGUtYmFuYW5hLmh0bWwiOiB7CisgICAgICAgICAgICAiZXhwZWN0ZWQiOiAiVEVYVCIs CisgICAgICAgICAgICAidGltZV9tcyI6IDIyNSwKKyAgICAgICAgICAgICJhY3R1YWwiOiAiUEFT UyIsCisgICAgICAgICAgICAiaGFzX3N0ZGVyciI6IGZhbHNlCisgICAgICAgIH0sCisgICAgICAg ICJmYXN0XC9kb21cL3Byb3RvdHlwZS10YWNvLmh0bWwiOiB7CisgICAgICAgICAgICAiZXhwZWN0 ZWQiOiAiUEFTUyIsCisgICAgICAgICAgICAidGltZV9tcyI6IDIyNSwKKyAgICAgICAgICAgICJh Y3R1YWwiOiAiUEFTUyBURVhUIiwKKyAgICAgICAgICAgICJoYXNfc3RkZXJyIjogZmFsc2UKKyAg ICAgICAgfSwKKyAgICAgICAgImZhc3RcL2RvbVwvcHJvdG90eXBlLXN0cmF3YmVycnkuaHRtbCI6 IHsKKyAgICAgICAgICAgICJleHBlY3RlZCI6ICJQQVNTIiwKKyAgICAgICAgICAgICJ0aW1lX21z IjogMjI1LAorICAgICAgICAgICAgImFjdHVhbCI6ICJURVhUIFBBU1MiLAorICAgICAgICAgICAg Imhhc19zdGRlcnIiOiBmYWxzZQogICAgICAgICB9CiAgICAgfSwKICAgICAic2tpcHBlZCI6IDQ1 MCwK 90837 2011-04-22 20:24:45 -0700 2011-05-01 22:42:00 -0700 Patch bug-59269-20110422202444.patch text/plain 3651 abarth SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDg0NzI4KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTYgQEAKKzIwMTEtMDQtMjIgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBKU09OVGVzdFJl c3VsdCBuZWVkcyB0byBoYW5kbGUgbXVsdGlwbGUgcmVzdWx0cworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTkyNjkKKworICAgICAgICBUaGlzIGNhc2Ug b2NjdXJzIHdoZW4gYSB0ZXN0IGlzIGZsYWt5IGJlY2F1c2UgTlJXVCB3aWxsIHJ1biB0aGUgdGVz dAorICAgICAgICB0d2ljZSBhbmQgcmVwb3J0IGJvdGggcmVzdWx0cyBhcyAiYWN0dWFsLiIKKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9yZXN1bHRzanNvbnBhcnNlci5w eToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvcmVzdWx0c2pzb25wYXJz ZXJfdW5pdHRlc3QucHk6CisKIDIwMTEtMDQtMjIgIElseWEgU2hlcm1hbiAgPGlzaGVybWFuQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292LgpJ bmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L3Jlc3VsdHNqc29ucGFyc2Vy LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9yZXN1 bHRzanNvbnBhcnNlci5weQkocmV2aXNpb24gODQ2NTUpCisrKyBUb29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9uZXQvcmVzdWx0c2pzb25wYXJzZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTQ5 LDE2ICs0OSwxMyBAQCBjbGFzcyBKU09OVGVzdFJlc3VsdChvYmplY3QpOgogICAgICAgICByZXR1 cm4gc2VsZi5fcmVzdWx0X2RpY3QuZ2V0KCd0aW1lX21zJykKIAogICAgIGRlZiBkaWRfcGFzcyhz ZWxmKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX2FjdHVhbF9hc19leHBlY3RhdGlvbigpID09IHRl c3RfZXhwZWN0YXRpb25zLlBBU1MKKyAgICAgICAgcmV0dXJuIHRlc3RfZXhwZWN0YXRpb25zLlBB U1MgaW4gc2VsZi5fYWN0dWFsX2FzX2V4cGVjdGF0aW9uKCkKIAogICAgIGRlZiBfYWN0dWFsX2Fz X2V4cGVjdGF0aW9uKHNlbGYpOgotICAgICAgICBhY3R1YWxfcmVzdWx0ID0gc2VsZi5fcmVzdWx0 X2RpY3RbJ2FjdHVhbCddCi0gICAgICAgICMgVGhlcmUgc2hvdWxkIGFsd2F5cyBiZSBvbmx5IG9u ZSBleHBlY3RhdGlvbiBmb3IgYWN0dWFsCi0gICAgICAgIGFzc2VydCgnICcgbm90IGluIGFjdHVh bF9yZXN1bHQpCi0gICAgICAgIHJldHVybiB0ZXN0X2V4cGVjdGF0aW9ucy5UZXN0RXhwZWN0YXRp b25zLmV4cGVjdGF0aW9uX2Zyb21fc3RyaW5nKGFjdHVhbF9yZXN1bHQpCisgICAgICAgIGFjdHVh bF9yZXN1bHRzID0gc2VsZi5fcmVzdWx0X2RpY3RbJ2FjdHVhbCddCisgICAgICAgIHJldHVybiBt YXAodGVzdF9leHBlY3RhdGlvbnMuVGVzdEV4cGVjdGF0aW9ucy5leHBlY3RhdGlvbl9mcm9tX3N0 cmluZywgYWN0dWFsX3Jlc3VsdHMuc3BsaXQoJyAnKSkKIAotICAgIGRlZiBfZmFpbHVyZXMoc2Vs Zik6Ci0gICAgICAgIGFjdHVhbCA9IHNlbGYuX2FjdHVhbF9hc19leHBlY3RhdGlvbigpCisgICAg ZGVmIF9mYWlsdXJlX3R5cGVzX2Zyb21fYWN0dWFsX3Jlc3VsdChzZWxmLCBhY3R1YWwpOgogICAg ICAgICAjIEZJWE1FOiBUaGVyZSBkb2Vzbid0IHNlZW0gdG8gYmUgYSBmdWxsIGxpc3Qgb2YgYWxs IHBvc3NpYmxlIHZhbHVlcyBvZgogICAgICAgICAjICdhY3R1YWwnIGFueXdoZXJlLiAgSG93ZXZl ciBKU09OTGF5b3V0UmVzdWx0c0dlbmVyYXRvci5GQUlMVVJFX1RPX0NIQVIKICAgICAgICAgIyBp cyBhIHVzZWZ1bCByZWZlcmVuY2UgYXMgdGhhdCdzIGZvciAib2xkIiBzdHlsZSByZXN1bHRzLmpz b24gZmlsZXMKQEAgLTgyLDYgKzc5LDExIEBAIGNsYXNzIEpTT05UZXN0UmVzdWx0KG9iamVjdCk6 CiAgICAgICAgICAgICBsb2coIkZhaWxlZCB0byBoYW5kbGU6ICVzIiAlIHNlbGYuX3Jlc3VsdF9k aWN0WydhY3R1YWwnXSkKICAgICAgICAgICAgIHJldHVybiBbXQogCisgICAgZGVmIF9mYWlsdXJl cyhzZWxmKToKKyAgICAgICAgaWYgc2VsZi5kaWRfcGFzcygpOgorICAgICAgICAgICAgcmV0dXJu IFtdCisgICAgICAgIHJldHVybiBzdW0obWFwKHNlbGYuX2ZhaWx1cmVfdHlwZXNfZnJvbV9hY3R1 YWxfcmVzdWx0LCBzZWxmLl9hY3R1YWxfYXNfZXhwZWN0YXRpb24oKSksIFtdKQorCiAgICAgZGVm IHRlc3RfcmVzdWx0KHNlbGYpOgogICAgICAgICByZXR1cm4gdGVzdF9yZXN1bHRzLlRlc3RSZXN1 bHQoc2VsZi5fdGVzdF9uYW1lLCBzZWxmLl9mYWlsdXJlcygpLCB0ZXN0X3J1bl90aW1lPXNlbGYu dGVzdF9ydW50aW1lKCkpCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25l dC9yZXN1bHRzanNvbnBhcnNlcl91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvcmVzdWx0c2pzb25wYXJzZXJfdW5pdHRlc3QucHkJKHJl dmlzaW9uIDg0NjU1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L3Jlc3Vs dHNqc29ucGFyc2VyX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0OCwyNCBA QCBjbGFzcyBSZXN1bHRzSlNPTlBhcnNlclRlc3QodW5pdHRlc3QuVGVzCiAgICAgICAgICAgICAi dGltZV9tcyI6IDExMCwKICAgICAgICAgICAgICJhY3R1YWwiOiAiSU1BR0UiLAogICAgICAgICAg ICAgImhhc19zdGRlcnIiOiBmYWxzZQorICAgICAgICB9LAorICAgICAgICAiZmFzdFwvZG9tXC9w cm90b3R5cGUtYmFuYW5hLmh0bWwiOiB7CisgICAgICAgICAgICAiZXhwZWN0ZWQiOiAiVEVYVCIs CisgICAgICAgICAgICAidGltZV9tcyI6IDIyNSwKKyAgICAgICAgICAgICJhY3R1YWwiOiAiUEFT UyIsCisgICAgICAgICAgICAiaGFzX3N0ZGVyciI6IGZhbHNlCisgICAgICAgIH0sCisgICAgICAg ICJmYXN0XC9kb21cL3Byb3RvdHlwZS10YWNvLmh0bWwiOiB7CisgICAgICAgICAgICAiZXhwZWN0 ZWQiOiAiUEFTUyIsCisgICAgICAgICAgICAidGltZV9tcyI6IDIyNSwKKyAgICAgICAgICAgICJh Y3R1YWwiOiAiUEFTUyBURVhUIiwKKyAgICAgICAgICAgICJoYXNfc3RkZXJyIjogZmFsc2UKKyAg ICAgICAgfSwKKyAgICAgICAgImZhc3RcL2RvbVwvcHJvdG90eXBlLXN0cmF3YmVycnkuaHRtbCI6 IHsKKyAgICAgICAgICAgICJleHBlY3RlZCI6ICJQQVNTIiwKKyAgICAgICAgICAgICJ0aW1lX21z IjogMjI1LAorICAgICAgICAgICAgImFjdHVhbCI6ICJURVhUIFBBU1MiLAorICAgICAgICAgICAg Imhhc19zdGRlcnIiOiBmYWxzZQogICAgICAgICB9CiAgICAgfSwKICAgICAic2tpcHBlZCI6IDQ1 MCwK 91884 2011-05-01 22:42:04 -0700 2011-05-01 23:15:08 -0700 Patch bug-59269-20110501224203.patch text/plain 4023 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogODU0NTQKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0ZTQ0MjcxMDBlOGFjODY0Y2RjOGEwOGE2NDQwNjBiYjU0 NmNmM2U3Li4zMGI3NWIwOTFlNzg5OTZjMjhiZDlkOWE3OWUxZTlkYjI2NTY3ODUxIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMTkg QEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBKU09O VGVzdFJlc3VsdCBuZWVkcyB0byBoYW5kbGUgbXVsdGlwbGUgcmVzdWx0cworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTkyNjkKKworICAgICAgICBUaGlz IGNhc2Ugb2NjdXJzIHdoZW4gYSB0ZXN0IGlzIGZsYWt5IGJlY2F1c2UgTlJXVCB3aWxsIHJ1biB0 aGUgdGVzdAorICAgICAgICB0d2ljZSBhbmQgcmVwb3J0IGJvdGggcmVzdWx0cyBhcyAiYWN0dWFs LiIKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9yZXN1bHRzanNvbnBh cnNlci5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvcmVzdWx0c2pz b25wYXJzZXJfdW5pdHRlc3QucHk6CisKKzIwMTEtMDUtMDEgIEFkYW0gQmFydGggIDxhYmFydGhA d2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAg ICAgICB3b3Jrc3BhY2UucHkgZmFpbHMgdG8gaW1wb3J0IFNjcmlwdEVycm9yCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTkxNQogCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvcmVzdWx0c2pzb25wYXJzZXIucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvcmVzdWx0c2pzb25wYXJzZXIucHkK aW5kZXggNjEwMzE4MjkzMjc2NTA1NjVmZmMxZWVlZmFkOWI2YWMzYTU1ODc1YS4uYjVkNzgwMDEz ODU4YzBkZmM0NTAyNGE1YmM3M2I1Y2ZiNmZkOGVhNiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vbmV0L3Jlc3VsdHNqc29ucGFyc2VyLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9yZXN1bHRzanNvbnBhcnNlci5weQpAQCAtNjMsMTYg KzYzLDE2IEBAIGNsYXNzIEpTT05UZXN0UmVzdWx0KG9iamVjdCk6CiAgICAgICAgIHNlbGYuX3Jl c3VsdF9kaWN0ID0gcmVzdWx0X2RpY3QKIAogICAgIGRlZiBkaWRfcGFzcyhzZWxmKToKLSAgICAg ICAgcmV0dXJuIHNlbGYuX2FjdHVhbF9hc19leHBlY3RhdGlvbigpID09IHRlc3RfZXhwZWN0YXRp b25zLlBBU1MKKyAgICAgICAgcmV0dXJuIHRlc3RfZXhwZWN0YXRpb25zLlBBU1MgaW4gc2VsZi5f YWN0dWFsX2FzX2V4cGVjdGF0aW9ucygpCiAKLSAgICBkZWYgX2FjdHVhbF9hc19leHBlY3RhdGlv bihzZWxmKToKLSAgICAgICAgYWN0dWFsX3Jlc3VsdCA9IHNlbGYuX3Jlc3VsdF9kaWN0WydhY3R1 YWwnXQotICAgICAgICAjIFRoZXJlIHNob3VsZCBhbHdheXMgYmUgb25seSBvbmUgZXhwZWN0YXRp b24gZm9yIGFjdHVhbAotICAgICAgICBhc3NlcnQoJyAnIG5vdCBpbiBhY3R1YWxfcmVzdWx0KQot ICAgICAgICByZXR1cm4gdGVzdF9leHBlY3RhdGlvbnMuVGVzdEV4cGVjdGF0aW9ucy5leHBlY3Rh dGlvbl9mcm9tX3N0cmluZyhhY3R1YWxfcmVzdWx0KQorICAgIGRlZiBfYWN0dWFsX2FzX2V4cGVj dGF0aW9ucyhzZWxmKToKKyAgICAgICAgYWN0dWFsX3Jlc3VsdHMgPSBzZWxmLl9yZXN1bHRfZGlj dFsnYWN0dWFsJ10KKyAgICAgICAgZXhwZWN0YXRpb25zID0gbWFwKHRlc3RfZXhwZWN0YXRpb25z LlRlc3RFeHBlY3RhdGlvbnMuZXhwZWN0YXRpb25fZnJvbV9zdHJpbmcsIGFjdHVhbF9yZXN1bHRz LnNwbGl0KCcgJykpCisgICAgICAgIGlmIE5vbmUgaW4gZXhwZWN0YXRpb25zOgorICAgICAgICAg ICAgbG9nKCJVbnJlY29nbml6ZWQgYWN0dWFsIHJlc3VsdCBpbiAlcyIgJSBhY3R1YWxfcmVzdWx0 cykKKyAgICAgICAgcmV0dXJuIGV4cGVjdGF0aW9ucwogCi0gICAgZGVmIF9mYWlsdXJlcyhzZWxm KToKLSAgICAgICAgYWN0dWFsID0gc2VsZi5fYWN0dWFsX2FzX2V4cGVjdGF0aW9uKCkKKyAgICBk ZWYgX2ZhaWx1cmVfdHlwZXNfZnJvbV9hY3R1YWxfcmVzdWx0KHNlbGYsIGFjdHVhbCk6CiAgICAg ICAgICMgRklYTUU6IFRoZXJlIGRvZXNuJ3Qgc2VlbSB0byBiZSBhIGZ1bGwgbGlzdCBvZiBhbGwg cG9zc2libGUgdmFsdWVzIG9mCiAgICAgICAgICMgJ2FjdHVhbCcgYW55d2hlcmUuICBIb3dldmVy IEpTT05MYXlvdXRSZXN1bHRzR2VuZXJhdG9yLkZBSUxVUkVfVE9fQ0hBUgogICAgICAgICAjIGlz IGEgdXNlZnVsIHJlZmVyZW5jZSBhcyB0aGF0J3MgZm9yICJvbGQiIHN0eWxlIHJlc3VsdHMuanNv biBmaWxlcwpAQCAtOTYsNiArOTYsMTEgQEAgY2xhc3MgSlNPTlRlc3RSZXN1bHQob2JqZWN0KToK ICAgICAgICAgICAgIGxvZygiRmFpbGVkIHRvIGhhbmRsZTogJXMiICUgc2VsZi5fcmVzdWx0X2Rp Y3RbJ2FjdHVhbCddKQogICAgICAgICAgICAgcmV0dXJuIFtdCiAKKyAgICBkZWYgX2ZhaWx1cmVz KHNlbGYpOgorICAgICAgICBpZiBzZWxmLmRpZF9wYXNzKCk6CisgICAgICAgICAgICByZXR1cm4g W10KKyAgICAgICAgcmV0dXJuIHN1bShtYXAoc2VsZi5fZmFpbHVyZV90eXBlc19mcm9tX2FjdHVh bF9yZXN1bHQsIHNlbGYuX2FjdHVhbF9hc19leHBlY3RhdGlvbnMoKSksIFtdKQorCiAgICAgZGVm IHRlc3RfcmVzdWx0KHNlbGYpOgogICAgICAgICAjIEZJWE1FOiBPcHRpb25hbGx5IHB1bGwgaW4g dGhlIHRlc3QgcnVudGltZSBmcm9tIHRpbWVzX21zLmpzb24uCiAgICAgICAgIHJldHVybiB0ZXN0 X3Jlc3VsdHMuVGVzdFJlc3VsdChzZWxmLl90ZXN0X25hbWUsIHNlbGYuX2ZhaWx1cmVzKCkpCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvcmVzdWx0c2pzb25w YXJzZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvcmVz dWx0c2pzb25wYXJzZXJfdW5pdHRlc3QucHkKaW5kZXggZGNjMjYxOGI3ODU3YWI5ZGIyNWFmYWE1 MDE2YjM2NzQwYzkyNTEwYi4uYjU3ZDRkN2E5MGJmMTcwMjk3ODJlMjRiOTEwY2E1NjY4NWQwYjdm NSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L3Jlc3VsdHNq c29ucGFyc2VyX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L25ldC9yZXN1bHRzanNvbnBhcnNlcl91bml0dGVzdC5weQpAQCAtNDIsNiArNDIsMTggQEAgY2xh c3MgUmVzdWx0c0pTT05QYXJzZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAg ICAgICAicHJvdG90eXBlLWluaGVyaXRhbmNlLmh0bWwiOiB7CiAgICAgICAgICAgICAgICAgICAg ICJleHBlY3RlZCI6ICJQQVNTIiwKICAgICAgICAgICAgICAgICAgICAgImFjdHVhbCI6ICJURVhU IgorICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgInByb3RvdHlwZS1iYW5hbmEu aHRtbCI6IHsKKyAgICAgICAgICAgICAgICAgICAgImV4cGVjdGVkIjogIlRFWFQiLAorICAgICAg ICAgICAgICAgICAgICAiYWN0dWFsIjogIlBBU1MiCisgICAgICAgICAgICAgICAgfSwKKyAgICAg ICAgICAgICAgICAicHJvdG90eXBlLXRhY28uaHRtbCI6IHsKKyAgICAgICAgICAgICAgICAgICAg ImV4cGVjdGVkIjogIlBBU1MiLAorICAgICAgICAgICAgICAgICAgICAiYWN0dWFsIjogIlBBU1Mg VEVYVCIKKyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgICJwcm90b3R5cGUtc3Ry YXdiZXJyeS5odG1sIjogeworICAgICAgICAgICAgICAgICAgICAiZXhwZWN0ZWQiOiAiUEFTUyIs CisgICAgICAgICAgICAgICAgICAgICJhY3R1YWwiOiAiVEVYVCBQQVNTIgogICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgfSwK