105500 2012-12-19 22:59:03 -0800 Cleanup some captions menu tests 2012-12-20 12:13:53 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino eric.carlson feature-media-reviews webkit-bug-importer webkit.review.bot oldest_to_newest 795205 0 dino 2012-12-19 22:59:03 -0800 Some of the media captions menu tests can be tidied. For example: - video-controls-captions-trackmenu should use the shared test helper JS library - the tests should dynamically add the video src so that we always catch the 'canplaythrough' event (it sometimes misses) 795208 1 webkit-bug-importer 2012-12-19 23:02:16 -0800 <rdar://problem/12915971> 795210 2 180282 dino 2012-12-19 23:05:46 -0800 Created attachment 180282 Patch 795652 3 dino 2012-12-20 12:13:53 -0800 Committed r138283: <http://trac.webkit.org/changeset/138283> 180282 2012-12-19 23:05:46 -0800 2012-12-20 09:44:52 -0800 Patch bug-105500-20121220180301.patch text/plain 9632 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4MTk5CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjAxOTdhMDVhY2Y2ZTZlYTk0MDNm NzlmYTlhYmU3NTNhOGU4ODJjNS4uYTkyNTY5NzlhOWY5YzVkOWYxMzE3MzNkYmUwNmVhMzdlNzc2 MmU5OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDEyLTEyLTE5ICBEZWFuIEphY2tzb24gIDxk aW5vQGFwcGxlLmNvbT4KIAorICAgICAgICBDbGVhbnVwIHNvbWUgY2FwdGlvbnMgbWVudSB0ZXN0 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1NTAw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIHRo ZSBoZWxwZXIgbGlicmFyeSB3aGVyZSBwb3NzaWJsZS4gRHluYW1pY2FsbHkgYWRkCisgICAgICAg IHZpZGVvLnNyYyBzbyB0aGF0IHdlIGFsd2F5cyBnZXQgdGhlICdjYW5wbGF5dGhyb3VnaCcgZXZl bnQuCisKKyAgICAgICAgKiBtZWRpYS92aWRlby1jb250cm9scy1jYXB0aW9ucy10cmFja21lbnUt ZXhwZWN0ZWQudHh0OgorICAgICAgICAqIG1lZGlhL3ZpZGVvLWNvbnRyb2xzLWNhcHRpb25zLXRy YWNrbWVudS1sb2NhbGl6ZWQuaHRtbDoKKyAgICAgICAgKiBtZWRpYS92aWRlby1jb250cm9scy1j YXB0aW9ucy10cmFja21lbnUtc29ydGVkLmh0bWw6CisgICAgICAgICogbWVkaWEvdmlkZW8tY29u dHJvbHMtY2FwdGlvbnMtdHJhY2ttZW51Lmh0bWw6CisKKzIwMTItMTItMTkgIERlYW4gSmFja3Nv biAgPGRpbm9AYXBwbGUuY29tPgorCiAgICAgICAgIEZvbGxvdyBXZWJWVFQgbGluZSBicmVha2lu ZyBydWxlcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTA1NDk2CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNvbnRyb2xzLWNh cHRpb25zLXRyYWNrbWVudS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1j b250cm9scy1jYXB0aW9ucy10cmFja21lbnUtZXhwZWN0ZWQudHh0CmluZGV4IDc1ZDY1YzdkMjBl OWQ5OTQzNDg1YTMzMzJkOWIzM2E5ODM0MDMwODAuLmUzZDlhMTQwNjk2ZDgzZjg1MTM5MTZiYmVi ZjA0NzJmODRkODg0ZTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNvbnRy b2xzLWNhcHRpb25zLXRyYWNrbWVudS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvbWVk aWEvdmlkZW8tY29udHJvbHMtY2FwdGlvbnMtdHJhY2ttZW51LWV4cGVjdGVkLnR4dApAQCAtMiwx NSArMiwxNCBAQCBUZXN0IHRoYXQgd2UgYXJlIGFibGUgdG8gdHJpZ2dlciB0aGUgbGlzdCBvZiBj YXB0aW9ucywgYW5kIHNlbGVjdCBmcm9tIHRoZSBsaXN0LgogCiBFVkVOVChjYW5wbGF5dGhyb3Vn aCkKIAotKioqIEFkZCBhbm90aGVyIHRleHQgdHJhY2suCi1SVU4odmlkZW8uYWRkVGV4dFRyYWNr KCJjYXB0aW9ucyIsICJDb21tZW50YXJ5IiwgInJ1IikpCi0KICoqKiBTZXQgdGhlIHVzZXIgbGFu Z3VhZ2UgcHJlZmVyZW5jZS4KIFJVTihpbnRlcm5hbHMuc2V0VXNlclByZWZlcnJlZExhbmd1YWdl cyhbJ2VuJ10pKQogCi0qKiogQ2xpY2sgdGhlIENDIGJ1dHRvbi4KKyoqKiBBZGQgYW5vdGhlciB0 ZXh0IHRyYWNrLgorUlVOKHZpZGVvLmFkZFRleHRUcmFjaygiY2FwdGlvbnMiLCAiQ29tbWVudGFy eSIsICJydSIpKQogKioqIFR1cm5pbmcgY2FwdGlvbnMgb24KLUZvdW5kIDUgbWVudSBpdGVtcyBP SworVGhlcmUgc2hvdWxkIGJlIDUgaXRlbXMgaW4gdGhlIG1lbnUuCitFWFBFQ1RFRCAoNSA9PSAn NScpIE9LCiBFWFBFQ1RFRCAodmlkZW8udGV4dFRyYWNrcy5sZW5ndGggPT0gJzQnKSBPSwogVHJh Y2sgMCBzaG91bGQgYmUgZGlzYWJsZWQKIEVYUEVDVEVEICh2aWRlby50ZXh0VHJhY2tzWzBdLm1v ZGUgPT0gJ2Rpc2FibGVkJykgT0sKQEAgLTI0LDEwICsyMyw5IEBAIEVYUEVDVEVEICh0ZXh0VHJh Y2tEaXNwbGF5RWxlbWVudCh2aWRlbywgJ2Rpc3BsYXknKS5pbm5lclRleHQgPT0gJ0xvcmVtJykg T0sKIAogKioqIFJlbW92ZSBhIHRyYWNrLgogUlVOKHZpZGVvLnJlbW92ZUNoaWxkKGRvY3VtZW50 LnF1ZXJ5U2VsZWN0b3JBbGwoInRyYWNrIilbMF0pKQotCi0qKiogQ2xpY2sgdGhlIENDIGJ1dHRv bi4KICoqKiBUdXJuaW5nIGNhcHRpb25zIG9mZgotRm91bmQgNCBtZW51IGl0ZW1zIE9LCitUaGVy ZSBzaG91bGQgYmUgNCBpdGVtcyBpbiB0aGUgbWVudS4KK0VYUEVDVEVEICg0ID09ICc0JykgT0sK IEVYUEVDVEVEICh2aWRlby50ZXh0VHJhY2tzLmxlbmd0aCA9PSAnMycpIE9LCiBUcmFjayAwIHNo b3VsZCBiZSBkaXNhYmxlZAogRVhQRUNURUQgKHZpZGVvLnRleHRUcmFja3NbMF0ubW9kZSA9PSAn ZGlzYWJsZWQnKSBPSwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJv bHMtY2FwdGlvbnMtdHJhY2ttZW51LWxvY2FsaXplZC5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEv dmlkZW8tY29udHJvbHMtY2FwdGlvbnMtdHJhY2ttZW51LWxvY2FsaXplZC5odG1sCmluZGV4IDBm MDc3YTg1M2E4NDFmYmI4MWQ5MjRhOTBjMTY3MzhiY2RkM2MwMzEuLjZjYmNkMjJmY2EwNjIzZDhm ZDhiMDZhZjg5MGI1Y2QwMzQ1Mjk4OGIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL21lZGlhL3Zp ZGVvLWNvbnRyb2xzLWNhcHRpb25zLXRyYWNrbWVudS1sb2NhbGl6ZWQuaHRtbAorKysgYi9MYXlv dXRUZXN0cy9tZWRpYS92aWRlby1jb250cm9scy1jYXB0aW9ucy10cmFja21lbnUtbG9jYWxpemVk Lmh0bWwKQEAgLTUyLDYgKzUyLDcgQEAKICAgICAgICAgZnVuY3Rpb24gc3RhcnQoKQogICAgICAg ICB7CiAgICAgICAgICAgICBmaW5kTWVkaWFFbGVtZW50KCk7CisgICAgICAgICAgICB2aWRlby5z cmMgPSBmaW5kTWVkaWFGaWxlKCd2aWRlbycsICdjb250ZW50L3Rlc3QnKTsKICAgICAgICAgICAg IHdhaXRGb3JFdmVudCgnY2FucGxheXRocm91Z2gnLCBmdW5jdGlvbiAoKSB7IHN0YXJ0VHJhY2tN ZW51VGVzdCh0ZXN0TWVudUhlYWRlcnMpOyB9KTsKICAgICAgICAgfQogICAgICAgICA8L3Njcmlw dD4KQEAgLTYwLDggKzYxLDYgQEAKICAgICA8Ym9keSBvbmxvYWQ9InN0YXJ0KCkiPgogICAgICAg ICA8cD5UZXN0IHRoYXQgY2FwdGlvbnMgYW5kIHN1YnRpdGxlcyBtZW51IGl0ZW1zIGFyZSBsb2Nh bGl6ZWQuPC9wPgogICAgICAgICA8dmlkZW8gd2lkdGg9IjUwMCIgaGVpZ2h0PSIzMDAiIGNvbnRy b2xzPgotICAgICAgICAgICAgPHNvdXJjZSBzcmM9ImNvbnRlbnQvdGVzdC5tcDQiIHR5cGU9InZp ZGVvL21wNCI+Ci0gICAgICAgICAgICA8c291cmNlIHNyYz0iY29udGVudC90ZXN0Lm9ndiIgdHlw ZT0idmlkZW8vb2dnIj4KICAgICAgICAgICAgIDx0cmFjayBraW5kPSJjYXB0aW9ucyIgc3JjPSJ0 cmFjay9jYXB0aW9ucy13ZWJ2dHQvY2FwdGlvbnMtZmFzdC52dHQiPgogICAgICAgICAgICAgPHRy YWNrIGtpbmQ9InN1YnRpdGxlcyIgc3JjPSJ0cmFjay9jYXB0aW9ucy13ZWJ2dHQvY2FwdGlvbnMt ZmFzdC52dHQiPgogICAgICAgICA8L3ZpZGVvPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVk aWEvdmlkZW8tY29udHJvbHMtY2FwdGlvbnMtdHJhY2ttZW51LXNvcnRlZC5odG1sIGIvTGF5b3V0 VGVzdHMvbWVkaWEvdmlkZW8tY29udHJvbHMtY2FwdGlvbnMtdHJhY2ttZW51LXNvcnRlZC5odG1s CmluZGV4IGJhODYxNTg1YWU2OGIyNDc0YTZkN2Q3Y2JlYjc0ZDgyMGYwNTJiODAuLjc0N2Y0MDJl NWNjN2YwM2Y5Njk4ZDRiOGU5MjdkOTlhOTQzMTM5OWUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L21lZGlhL3ZpZGVvLWNvbnRyb2xzLWNhcHRpb25zLXRyYWNrbWVudS1zb3J0ZWQuaHRtbAorKysg Yi9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jb250cm9scy1jYXB0aW9ucy10cmFja21lbnUtc29y dGVkLmh0bWwKQEAgLTQ5LDYgKzQ5LDcgQEAKICAgICAgICAgICAgIGZ1bmN0aW9uIHN0YXJ0KCkK ICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICBmaW5kTWVkaWFFbGVtZW50KCk7CisgICAg ICAgICAgICAgICAgdmlkZW8uc3JjID0gZmluZE1lZGlhRmlsZSgndmlkZW8nLCAnY29udGVudC90 ZXN0Jyk7CiAgICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50KCdjYW5wbGF5dGhyb3VnaCcsIGZ1 bmN0aW9uICgpIHsgc3RhcnRUcmFja01lbnVUZXN0KHRlc3RTb3J0ZWRNZW51KTsgfSk7CiAgICAg ICAgICAgICB9CiAgICAgICAgIDwvc2NyaXB0PgpAQCAtNTcsOCArNTgsNiBAQAogICAgIDxib2R5 IG9ubG9hZD0ic3RhcnQoKSI+CiAgICAgICAgIDxwPlRlc3QgdGhhdCBjYXB0aW9ucyBhbmQgc3Vi dGl0bGVzIGFyZSBzb3J0ZWQgaW4gdGhlIG1lbnUuPC9wPgogICAgICAgICA8dmlkZW8gd2lkdGg9 IjUwMCIgaGVpZ2h0PSIzMDAiIGNvbnRyb2xzPgotICAgICAgICAgICAgPHNvdXJjZSBzcmM9ImNv bnRlbnQvdGVzdC5tcDQiIHR5cGU9InZpZGVvL21wNCI+Ci0gICAgICAgICAgICA8c291cmNlIHNy Yz0iY29udGVudC90ZXN0Lm9ndiIgdHlwZT0idmlkZW8vb2dnIj4KICAgICAgICAgICAgIDx0cmFj ayBsYWJlbD0iYyIga2luZD0iY2FwdGlvbnMiIHNyYz0idHJhY2svY2FwdGlvbnMtd2VidnR0L2Nh cHRpb25zLWZhc3QudnR0IiBzcmNsYW5nPSJqYSI+CiAgICAgICAgICAgICA8dHJhY2sgbGFiZWw9 ImIiIGtpbmQ9ImNhcHRpb25zIiBzcmM9InRyYWNrL2NhcHRpb25zLXdlYnZ0dC9jYXB0aW9ucy1m YXN0LnZ0dCIgc3JjbGFuZz0iZW4tYXUiPgogICAgICAgICAgICAgPHRyYWNrIGxhYmVsPSJhIiBr aW5kPSJjYXB0aW9ucyIgc3JjPSJ0cmFjay9jYXB0aW9ucy13ZWJ2dHQvY2FwdGlvbnMtZmFzdC52 dHQiIHNyY2xhbmc9ImVuIj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNv bnRyb2xzLWNhcHRpb25zLXRyYWNrbWVudS5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8t Y29udHJvbHMtY2FwdGlvbnMtdHJhY2ttZW51Lmh0bWwKaW5kZXggMDVhZWY4YmViM2FkMmU1YmZl Y2YwMGM5ZDk1MGNmZDkxNzY2Zjg3Mi4uMGIxMDdiMWRjZTFlYjcyYzY1ZGE2NTJlYTJiZmEyMzc1 MWM0NzBlYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJvbHMtY2Fw dGlvbnMtdHJhY2ttZW51Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJv bHMtY2FwdGlvbnMtdHJhY2ttZW51Lmh0bWwKQEAgLTUsNDggKzUsMjMgQEAKICAgICAgICAgPHNj cmlwdCBzcmM9Im1lZGlhLWNvbnRyb2xzLmpzIj48L3NjcmlwdD4KICAgICAgICAgPHNjcmlwdCBz cmM9Im1lZGlhLWZpbGUuanMiPjwvc2NyaXB0PgogICAgICAgICA8c2NyaXB0IHNyYz0idmlkZW8t dGVzdC5qcyI+PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPSJ0cmFja21lbnUtdGVzdC5q cyI+PC9zY3JpcHQ+CiAgICAgICAgIDxzY3JpcHQ+Ci0gICAgICAgICAgICB2YXIgY2FwdGlvbnNC dXR0b25Db29yZGluYXRlczsKLQogICAgICAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQog ICAgICAgICAgICAgICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOwogCi0gICAgICAgICAgICBm dW5jdGlvbiBjbGlja0NDQnV0dG9uKCkKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICBj b25zb2xlV3JpdGUoIjxicj4qKiogQ2xpY2sgdGhlIENDIGJ1dHRvbi4iKTsKLSAgICAgICAgICAg ICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyhjYXB0aW9uc0J1dHRvbkNvb3JkaW5hdGVzWzBd LCBjYXB0aW9uc0J1dHRvbkNvb3JkaW5hdGVzWzFdKTsKLSAgICAgICAgICAgICAgICBldmVudFNl bmRlci5tb3VzZURvd24oKTsKLSAgICAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVVwKCk7 Ci0gICAgICAgICAgICB9Ci0KICAgICAgICAgICAgIGZ1bmN0aW9uIHN0YXJ0VGVzdCgpCiAgICAg ICAgICAgICB7CiAgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8YnI+KioqIEFkZCBhbm90 aGVyIHRleHQgdHJhY2suIik7CiAgICAgICAgICAgICAgICAgcnVuKCd2aWRlby5hZGRUZXh0VHJh Y2soImNhcHRpb25zIiwgIkNvbW1lbnRhcnkiLCAicnUiKScpOwotICAgICAgICAgICAgICAgIGlm ICh3aW5kb3cuZXZlbnRTZW5kZXIpIHsKLSAgICAgICAgICAgICAgICAgICAgY29uc29sZVdyaXRl KCI8YnI+KioqIFNldCB0aGUgdXNlciBsYW5ndWFnZSBwcmVmZXJlbmNlLiIpOwotICAgICAgICAg ICAgICAgICAgICBydW4oImludGVybmFscy5zZXRVc2VyUHJlZmVycmVkTGFuZ3VhZ2VzKFsnZW4n XSkiKTsKLQotICAgICAgICAgICAgICAgICAgICB0cnkgewotICAgICAgICAgICAgICAgICAgICAg ICAgY2FwdGlvbnNCdXR0b25Db29yZGluYXRlcyA9IG1lZGlhQ29udHJvbHNCdXR0b25Db29yZGlu YXRlcyh2aWRlbywgInRvZ2dsZS1jbG9zZWQtY2FwdGlvbnMtYnV0dG9uIik7Ci0gICAgICAgICAg ICAgICAgICAgIH0gY2F0Y2ggKGV4Y2VwdGlvbikgewotICAgICAgICAgICAgICAgICAgICAgICAg ZmFpbFRlc3QoZXhjZXB0aW9uLmRlc2NyaXB0aW9uKTsKLSAgICAgICAgICAgICAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICBjbGlj a0NDQnV0dG9uKCk7Ci0gICAgICAgICAgICAgICAgICAgIHdpbmRvdy5zZXRUaW1lb3V0KHR1cm5D YXB0aW9uc09uLCAxMDApOwotICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB3aW5k b3cuc2V0VGltZW91dCh0dXJuQ2FwdGlvbnNPbiwgMTAwKTsKICAgICAgICAgICAgIH0KIAogICAg ICAgICAgICAgZnVuY3Rpb24gdHJhY2tNZW51TGlzdCgpCiAgICAgICAgICAgICB7Ci0gICAgICAg ICAgICAgICAgdmFyIHRyYWNrTGlzdEVsZW1lbnQ7Ci0gICAgICAgICAgICAgICAgdHJ5IHsKLSAg ICAgICAgICAgICAgICAgICAgdHJhY2tMaXN0RWxlbWVudCA9IG1lZGlhQ29udHJvbHNFbGVtZW50 KGludGVybmFscy5zaGFkb3dSb290KHZpZGVvKS5maXJzdENoaWxkLCAiLXdlYmtpdC1tZWRpYS1j b250cm9scy1jbG9zZWQtY2FwdGlvbnMtdHJhY2stbGlzdCIpOwotICAgICAgICAgICAgICAgIH0g Y2F0Y2ggKGV4Y2VwdGlvbikgewotICAgICAgICAgICAgICAgICAgICBmYWlsVGVzdChleGNlcHRp b24uZGVzY3JpcHRpb24pOworICAgICAgICAgICAgICAgIHZhciB0cmFja0xpc3RFbGVtZW50ID0g Z2V0VHJhY2tMaXN0RWxlbWVudCgpOworICAgICAgICAgICAgICAgIGlmICghdHJhY2tMaXN0RWxl bWVudCkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgICAgICAvLyBUcmFjayBsaXN0IHNob3VsZCBoYXZlIGEgPHVsPiB3aXRoIGZpdmUg PGxpPiBjaGlsZHJlbiAoT25lIG9mIHRoZW0gaXMgIk9mZiIpLgogICAgICAgICAgICAgICAgIHZh ciB0cmFja0xpc3QgPSB0cmFja0xpc3RFbGVtZW50LnF1ZXJ5U2VsZWN0b3IoInVsIik7CiAgICAg ICAgICAgICAgICAgaWYgKCF0cmFja0xpc3QpIHsKQEAgLTU1LDcgKzMwLDcgQEAKICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAgICAgdmFyIHRyYWNrTGlzdEl0ZW1zID0gdHJhY2tMaXN0 LnF1ZXJ5U2VsZWN0b3JBbGwoImxpIik7CiAgICAgICAgICAgICAgICAgaWYgKCF0cmFja0xpc3RJ dGVtcykgewotICAgICAgICAgICAgICAgICAgICBmYWlsVGVzdCgiQ291bGQgbm90IGZpbmQgYSBj aGlsZCBsaSBlbGVtZW50cyBpbiB0cmFjayBsaXN0IG1lbnUiKTsKKyAgICAgICAgICAgICAgICAg ICAgZmFpbFRlc3QoIkNvdWxkIG5vdCBmaW5kIGNoaWxkIGxpIGVsZW1lbnRzIGluIHRyYWNrIGxp c3QgbWVudSIpOwogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICAgICAg fQogCkBAIC02NiwxMSArNDEsOCBAQAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIHZh ciB0cmFja0xpc3RJdGVtcyA9IHRyYWNrTWVudUxpc3QoKTsKICAgICAgICAgICAgICAgICB2YXIg ZXhwZWN0ZWRJdGVtQ291bnQgPSB2aWRlby50ZXh0VHJhY2tzLmxlbmd0aCArIDE7Ci0gICAgICAg ICAgICAgICAgaWYgKHRyYWNrTGlzdEl0ZW1zLmxlbmd0aCAhPSBleHBlY3RlZEl0ZW1Db3VudCkg ewotICAgICAgICAgICAgICAgICAgICBmYWlsVGVzdCgiRXhwZWN0ZWQgIiArIGV4cGVjdGVkSXRl bUNvdW50ICsgIiBpdGVtcyBpbiBtZW51IGJ1dCBmb3VuZCAiICsgdHJhY2tMaXN0SXRlbXMubGVu Z3RoKTsKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgICAgIH0KLSAg ICAgICAgICAgICAgICBsb2dSZXN1bHQodHJ1ZSwgIkZvdW5kICIgKyBleHBlY3RlZEl0ZW1Db3Vu dCArICIgbWVudSBpdGVtcyIpOworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiVGhlcmUg c2hvdWxkIGJlICIgKyBleHBlY3RlZEl0ZW1Db3VudCArICIgaXRlbXMgaW4gdGhlIG1lbnUuIik7 CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKHRyYWNrTGlzdEl0ZW1zLmxlbmd0aCwgZXhw ZWN0ZWRJdGVtQ291bnQpOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBmdW5jdGlvbiBz ZWxlY3RDYXB0aW9uTWVudUl0ZW0oaW5kZXgsIG5leHRTdGVwKQpAQCAtMTM2LDcgKzEwOCw4IEBA CiAgICAgICAgICAgICBmdW5jdGlvbiBzdGFydCgpCiAgICAgICAgICAgICB7CiAgICAgICAgICAg ICAgICAgZmluZE1lZGlhRWxlbWVudCgpOwotICAgICAgICAgICAgICAgIHdhaXRGb3JFdmVudCgn Y2FucGxheXRocm91Z2gnLCBzdGFydFRlc3QpOworICAgICAgICAgICAgICAgIHZpZGVvLnNyYyA9 IGZpbmRNZWRpYUZpbGUoJ3ZpZGVvJywgJ2NvbnRlbnQvdGVzdCcpOworICAgICAgICAgICAgICAg IHdhaXRGb3JFdmVudCgnY2FucGxheXRocm91Z2gnLCBmdW5jdGlvbiAoKSB7IHN0YXJ0VHJhY2tN ZW51VGVzdChzdGFydFRlc3QpOyB9KTsKICAgICAgICAgICAgIH0KICAgICAgICAgPC9zY3JpcHQ+ CiAgICAgPC9oZWFkPgpAQCAtMTQ0LDggKzExNyw2IEBACiAgICAgPGJvZHkgb25sb2FkPSJzdGFy dCgpIj4KICAgICAgICAgPHA+VGVzdCB0aGF0IHdlIGFyZSBhYmxlIHRvIHRyaWdnZXIgdGhlIGxp c3Qgb2YgY2FwdGlvbnMsIGFuZCBzZWxlY3QgZnJvbSB0aGUgbGlzdC48L3A+CiAgICAgICAgIDx2 aWRlbyB3aWR0aD0iNTAwIiBoZWlnaHQ9IjMwMCIgY29udHJvbHM+Ci0gICAgICAgICAgICA8c291 cmNlIHNyYz0iY29udGVudC90ZXN0Lm1wNCIgdHlwZT0idmlkZW8vbXA0Ij4KLSAgICAgICAgICAg IDxzb3VyY2Ugc3JjPSJjb250ZW50L3Rlc3Qub2d2IiB0eXBlPSJ2aWRlby9vZ2ciPgogICAgICAg ICAgICAgPHRyYWNrIGtpbmQ9ImNhcHRpb25zIiBzcmM9InRyYWNrL2NhcHRpb25zLXdlYnZ0dC9j YXB0aW9ucy1mYXN0LnZ0dCIgc3JjbGFuZz0iZW4iPgogICAgICAgICAgICAgPHRyYWNrIGtpbmQ9 ImNhcHRpb25zIiBzcmM9InRyYWNrL2NhcHRpb25zLXdlYnZ0dC9jYXB0aW9ucy1mYXN0LnZ0dCIg c3JjbGFuZz0iZW4tYXUiPgogICAgICAgICAgICAgPHRyYWNrIGtpbmQ9ImNhcHRpb25zIiBzcmM9 InRyYWNrL2NhcHRpb25zLXdlYnZ0dC9jYXB0aW9ucy1mYXN0LnZ0dCIgc3JjbGFuZz0iamEiPgo=