94567 2012-08-20 20:25:57 -0700 _compare_image() swaps actual and expected images by mistake 2012-08-21 14:35:49 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser abarth dpranke ojan simon.fraser webkit.review.bot oldest_to_newest 700402 0 simon.fraser 2012-08-20 20:25:57 -0700 I'm pretty sure that _compare_image() is swapping the images by mistake: diff_result = self._port.diff_image(driver_output.image, expected_driver_output.image) def diff_image(self, expected_contents, actual_contents, tolerance): Note flipped order of params. 700406 1 159604 simon.fraser 2012-08-20 20:30:30 -0700 Created attachment 159604 Patch 700453 2 159604 simon.fraser 2012-08-20 21:49:38 -0700 Comment on attachment 159604 Patch Dirk wants to fix this another way. 700464 3 dpranke 2012-08-20 22:02:18 -0700 See https://bugs.webkit.org/show_bug.cgi?id=92578#c18 and https://bugs.webkit.org/show_bug.cgi?id=92578#c23 701050 4 159751 dpranke 2012-08-21 13:20:27 -0700 Created attachment 159751 Patch 701133 5 dpranke 2012-08-21 14:35:49 -0700 Committed r126188: <http://trac.webkit.org/changeset/126188> 159604 2012-08-20 20:30:30 -0700 2012-08-20 21:49:38 -0700 Patch bug-94567-20120820202950.patch text/plain 1926 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MTAxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWY0YjQxYTNhMGZmNTY2ZGFkZDNmMmJhYjQzMzEwZTE3 NGJjMTllZi4uZDZmY2FhOTlhYjBkMmIwNWJkZGY5NjU4NjQyODZlMDc3MGMwY2Q1MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3 IEBACiAyMDEyLTA4LTIwICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgog CisgICAgICAgIF9jb21wYXJlX2ltYWdlKCkgc3dhcHMgYWN0dWFsIGFuZCBleHBlY3RlZCBpbWFn ZXMgYnkgbWlzdGFrZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTQ1NjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBGaXggdGhlIG9yZGVyIG9mIHBhcmFtZXRlcnMgaW4gdGhlIGNhbGwgdG8gX3BvcnQuZGlm Zl9pbWFnZSgpIGluIF9jb21wYXJlX2ltYWdlKCkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9ydW5uZXIucHk6CisgICAg ICAgIChTaW5nbGVUZXN0UnVubmVyLl9jb21wYXJlX2ltYWdlKToKKworMjAxMi0wOC0yMCAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBMb3RzIG9mICJl cnJvciwgdGVzdCBhbmQgcmVmZXJlbmNlIGltYWdlIGhhdmUgZGlmZmVyZW50IHByb3BlcnRpZXMi IGluIHBpeGVsIHRlc3Qgb3V0cHV0CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05MjU3OAogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9ydW5uZXIucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9ydW5u ZXIucHkKaW5kZXggNzM3OWQ5N2MzNDYxM2E1ZThmY2ViYTE1MjEwNjhiNTc0M2UyNzgxYS4uNDVi NDdmMWFkODEzMTBiNmEzZjA2ODc1MzA0ZDcxMDBhMTUzYTNlZSAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvc2luZ2xlX3Rlc3RfcnVu bmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xs ZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weQpAQCAtMjY0LDcgKzI2NCw3IEBAIGNsYXNzIFNpbmds ZVRlc3RSdW5uZXIob2JqZWN0KToKICAgICAgICAgZWxpZiBub3QgZXhwZWN0ZWRfZHJpdmVyX291 dHB1dC5pbWFnZV9oYXNoOgogICAgICAgICAgICAgZmFpbHVyZXMuYXBwZW5kKHRlc3RfZmFpbHVy ZXMuRmFpbHVyZU1pc3NpbmdJbWFnZUhhc2goKSkKICAgICAgICAgZWxpZiBkcml2ZXJfb3V0cHV0 LmltYWdlX2hhc2ggIT0gZXhwZWN0ZWRfZHJpdmVyX291dHB1dC5pbWFnZV9oYXNoOgotICAgICAg ICAgICAgZGlmZl9yZXN1bHQgPSBzZWxmLl9wb3J0LmRpZmZfaW1hZ2UoZHJpdmVyX291dHB1dC5p bWFnZSwgZXhwZWN0ZWRfZHJpdmVyX291dHB1dC5pbWFnZSkKKyAgICAgICAgICAgIGRpZmZfcmVz dWx0ID0gc2VsZi5fcG9ydC5kaWZmX2ltYWdlKGV4cGVjdGVkX2RyaXZlcl9vdXRwdXQuaW1hZ2Us IGRyaXZlcl9vdXRwdXQuaW1hZ2UpCiAgICAgICAgICAgICBlcnJfc3RyID0gZGlmZl9yZXN1bHRb Ml0KICAgICAgICAgICAgICMgRklYTUU6IHNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTQyNzcgYW5kCiAgICAgICAgICAgICAjIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04MTk2MjsgSW1hZ2VEaWZmIGRvZXNuJ3QK 159751 2012-08-21 13:20:27 -0700 2012-08-21 14:16:56 -0700 Patch bug-94567-20120821132026.patch text/plain 10720 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MTc3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMGVmYzQzNjNjZjdiYjQ1OGYxOWY2ZTc3NzU4ZjM0ZmJl NjE1MzYzNi4uNDEyNzcxZjljZmM5NTEzOTRiMzczNjQ1NzUyZjVlNmViY2IxMzQ4ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDEyLTA4LTIxICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIF9jb21wYXJlX2ltYWdlKCkgc3dhcHMgYWN0dWFsIGFuZCBleHBlY3RlZCBpbWFnZXMg YnkgbWlzdGFrZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTQ1NjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBSZS13b3JrIHRoZSBjb2RlIHNvIHRoYXQgd2UgY29uc2lzdGVudGx5IHBhc3MgKGV4cGVjdGVk LCBhY3R1YWwpCisgICAgICAgIGFjcm9zcyBhbGwgb2YgdGhlIGNvbXBhcmUvZGlmZiByb3V0aW5l cy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJz L3NpbmdsZV90ZXN0X3J1bm5lci5weToKKyAgICAgICAgKFNpbmdsZVRlc3RSdW5uZXIuX3J1bl9j b21wYXJlX3Rlc3QpOgorICAgICAgICAoU2luZ2xlVGVzdFJ1bm5lci5fY29tcGFyZV9vdXRwdXQp OgorICAgICAgICAoU2luZ2xlVGVzdFJ1bm5lci5fY29tcGFyZV90ZXh0KToKKyAgICAgICAgKFNp bmdsZVRlc3RSdW5uZXIuX2NvbXBhcmVfYXVkaW8pOgorICAgICAgICAoU2luZ2xlVGVzdFJ1bm5l ci5fY29tcGFyZV9pbWFnZSk6CisgICAgICAgIChTaW5nbGVUZXN0UnVubmVyLl9ydW5fcmVmdGVz dCk6CisgICAgICAgIChTaW5nbGVUZXN0UnVubmVyLl9jb21wYXJlX291dHB1dF93aXRoX3JlZmVy ZW5jZSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxl cnMvdGVzdF9yZXN1bHRfd3JpdGVyLnB5OgorICAgICAgICAod3JpdGVfdGVzdF9yZXN1bHQpOgor CiAyMDEyLTA4LTIwICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAg IE1vdmUgZnJlZSBmdW5jdGlvbnMgaW4gdGVzdF9leHBlY3RhdGlvbnMgdG8gVGVzdEV4cGVjdGF0 aW9ucyBjbGFzcwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvY29udHJvbGxlcnMvc2luZ2xlX3Rlc3RfcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvc2luZ2xlX3Rlc3RfcnVubmVyLnB5CmluZGV4 IDczNzlkOTdjMzQ2MTNhNWU4ZmNlYmExNTIxMDY4YjU3NDNlMjc4MWEuLjdiMTRlNmIwOWY4NGEx OGY2ZmZhOTJiYTg4NGIyNWI4M2EyOTQxNjkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVf dGVzdF9ydW5uZXIucHkKQEAgLTExMCw3ICsxMTAsNyBAQCBjbGFzcyBTaW5nbGVUZXN0UnVubmVy KG9iamVjdCk6CiAgICAgICAgICAgICBleHBlY3RlZF9kcml2ZXJfb3V0cHV0LnN0cmlwX21ldHJp Y3MoKQogICAgICAgICAgICAgZHJpdmVyX291dHB1dC5zdHJpcF9tZXRyaWNzKCkKIAotICAgICAg ICB0ZXN0X3Jlc3VsdCA9IHNlbGYuX2NvbXBhcmVfb3V0cHV0KGRyaXZlcl9vdXRwdXQsIGV4cGVj dGVkX2RyaXZlcl9vdXRwdXQpCisgICAgICAgIHRlc3RfcmVzdWx0ID0gc2VsZi5fY29tcGFyZV9v dXRwdXQoZXhwZWN0ZWRfZHJpdmVyX291dHB1dCwgZHJpdmVyX291dHB1dCkKICAgICAgICAgaWYg c2VsZi5fb3B0aW9ucy5uZXdfdGVzdF9yZXN1bHRzOgogICAgICAgICAgICAgc2VsZi5fYWRkX21p c3NpbmdfYmFzZWxpbmVzKHRlc3RfcmVzdWx0LCBkcml2ZXJfb3V0cHV0KQogICAgICAgICB0ZXN0 X3Jlc3VsdF93cml0ZXIud3JpdGVfdGVzdF9yZXN1bHQoc2VsZi5fZmlsZXN5c3RlbSwgc2VsZi5f cG9ydCwgc2VsZi5fdGVzdF9uYW1lLCBkcml2ZXJfb3V0cHV0LCBleHBlY3RlZF9kcml2ZXJfb3V0 cHV0LCB0ZXN0X3Jlc3VsdC5mYWlsdXJlcykKQEAgLTIwOSw3ICsyMDksNyBAQCBjbGFzcyBTaW5n bGVUZXN0UnVubmVyKG9iamVjdCk6CiAgICAgICAgICAgICBfbG9nLmRlYnVnKCIgICVzIiAlIGxp bmUpCiAgICAgICAgIHJldHVybiBmYWlsdXJlcwogCi0gICAgZGVmIF9jb21wYXJlX291dHB1dChz ZWxmLCBkcml2ZXJfb3V0cHV0LCBleHBlY3RlZF9kcml2ZXJfb3V0cHV0KToKKyAgICBkZWYgX2Nv bXBhcmVfb3V0cHV0KHNlbGYsIGV4cGVjdGVkX2RyaXZlcl9vdXRwdXQsIGRyaXZlcl9vdXRwdXQp OgogICAgICAgICBmYWlsdXJlcyA9IFtdCiAgICAgICAgIGZhaWx1cmVzLmV4dGVuZChzZWxmLl9o YW5kbGVfZXJyb3IoZHJpdmVyX291dHB1dCkpCiAKQEAgLTIxOCwyNiArMjE4LDI2IEBAIGNsYXNz IFNpbmdsZVRlc3RSdW5uZXIob2JqZWN0KToKICAgICAgICAgICAgICMgSW4gY2FzZSBvZiB0aW1l b3V0cywgd2UgY29udGludWUgc2luY2Ugd2Ugc3RpbGwgd2FudCB0byBzZWUgdGhlIHRleHQgYW5k IGltYWdlIG91dHB1dC4KICAgICAgICAgICAgIHJldHVybiBUZXN0UmVzdWx0KHNlbGYuX3Rlc3Rf bmFtZSwgZmFpbHVyZXMsIGRyaXZlcl9vdXRwdXQudGVzdF90aW1lLCBkcml2ZXJfb3V0cHV0Lmhh c19zdGRlcnIoKSkKIAotICAgICAgICBmYWlsdXJlcy5leHRlbmQoc2VsZi5fY29tcGFyZV90ZXh0 KGRyaXZlcl9vdXRwdXQudGV4dCwgZXhwZWN0ZWRfZHJpdmVyX291dHB1dC50ZXh0KSkKLSAgICAg ICAgZmFpbHVyZXMuZXh0ZW5kKHNlbGYuX2NvbXBhcmVfYXVkaW8oZHJpdmVyX291dHB1dC5hdWRp bywgZXhwZWN0ZWRfZHJpdmVyX291dHB1dC5hdWRpbykpCisgICAgICAgIGZhaWx1cmVzLmV4dGVu ZChzZWxmLl9jb21wYXJlX3RleHQoZXhwZWN0ZWRfZHJpdmVyX291dHB1dC50ZXh0LCBkcml2ZXJf b3V0cHV0LnRleHQpKQorICAgICAgICBmYWlsdXJlcy5leHRlbmQoc2VsZi5fY29tcGFyZV9hdWRp byhleHBlY3RlZF9kcml2ZXJfb3V0cHV0LmF1ZGlvLCBkcml2ZXJfb3V0cHV0LmF1ZGlvKSkKICAg ICAgICAgaWYgc2VsZi5fc2hvdWxkX3J1bl9waXhlbF90ZXN0OgotICAgICAgICAgICAgZmFpbHVy ZXMuZXh0ZW5kKHNlbGYuX2NvbXBhcmVfaW1hZ2UoZHJpdmVyX291dHB1dCwgZXhwZWN0ZWRfZHJp dmVyX291dHB1dCkpCisgICAgICAgICAgICBmYWlsdXJlcy5leHRlbmQoc2VsZi5fY29tcGFyZV9p bWFnZShleHBlY3RlZF9kcml2ZXJfb3V0cHV0LCBkcml2ZXJfb3V0cHV0KSkKICAgICAgICAgcmV0 dXJuIFRlc3RSZXN1bHQoc2VsZi5fdGVzdF9uYW1lLCBmYWlsdXJlcywgZHJpdmVyX291dHB1dC50 ZXN0X3RpbWUsIGRyaXZlcl9vdXRwdXQuaGFzX3N0ZGVycigpKQogCi0gICAgZGVmIF9jb21wYXJl X3RleHQoc2VsZiwgYWN0dWFsX3RleHQsIGV4cGVjdGVkX3RleHQpOgorICAgIGRlZiBfY29tcGFy ZV90ZXh0KHNlbGYsIGV4cGVjdGVkX3RleHQsIGFjdHVhbF90ZXh0KToKICAgICAgICAgZmFpbHVy ZXMgPSBbXQogICAgICAgICBpZiAoZXhwZWN0ZWRfdGV4dCBhbmQgYWN0dWFsX3RleHQgYW5kCiAg ICAgICAgICAgICAjIEFzc3VtaW5nIGV4cGVjdGVkX3RleHQgaXMgYWxyZWFkeSBub3JtYWxpemVk LgotICAgICAgICAgICAgc2VsZi5fcG9ydC5kb190ZXh0X3Jlc3VsdHNfZGlmZmVyKHNlbGYuX2dl dF9ub3JtYWxpemVkX291dHB1dF90ZXh0KGFjdHVhbF90ZXh0KSwgZXhwZWN0ZWRfdGV4dCkpOgor ICAgICAgICAgICAgc2VsZi5fcG9ydC5kb190ZXh0X3Jlc3VsdHNfZGlmZmVyKGV4cGVjdGVkX3Rl eHQsIHNlbGYuX2dldF9ub3JtYWxpemVkX291dHB1dF90ZXh0KGFjdHVhbF90ZXh0KSkpOgogICAg ICAgICAgICAgZmFpbHVyZXMuYXBwZW5kKHRlc3RfZmFpbHVyZXMuRmFpbHVyZVRleHRNaXNtYXRj aCgpKQogICAgICAgICBlbGlmIGFjdHVhbF90ZXh0IGFuZCBub3QgZXhwZWN0ZWRfdGV4dDoKICAg ICAgICAgICAgIGZhaWx1cmVzLmFwcGVuZCh0ZXN0X2ZhaWx1cmVzLkZhaWx1cmVNaXNzaW5nUmVz dWx0KCkpCiAgICAgICAgIHJldHVybiBmYWlsdXJlcwogCi0gICAgZGVmIF9jb21wYXJlX2F1ZGlv KHNlbGYsIGFjdHVhbF9hdWRpbywgZXhwZWN0ZWRfYXVkaW8pOgorICAgIGRlZiBfY29tcGFyZV9h dWRpbyhzZWxmLCBleHBlY3RlZF9hdWRpbywgYWN0dWFsX2F1ZGlvKToKICAgICAgICAgZmFpbHVy ZXMgPSBbXQogICAgICAgICBpZiAoZXhwZWN0ZWRfYXVkaW8gYW5kIGFjdHVhbF9hdWRpbyBhbmQK LSAgICAgICAgICAgIHNlbGYuX3BvcnQuZG9fYXVkaW9fcmVzdWx0c19kaWZmZXIoYWN0dWFsX2F1 ZGlvLCBleHBlY3RlZF9hdWRpbykpOgorICAgICAgICAgICAgc2VsZi5fcG9ydC5kb19hdWRpb19y ZXN1bHRzX2RpZmZlcihleHBlY3RlZF9hdWRpbywgYWN0dWFsX2F1ZGlvKSk6CiAgICAgICAgICAg ICBmYWlsdXJlcy5hcHBlbmQodGVzdF9mYWlsdXJlcy5GYWlsdXJlQXVkaW9NaXNtYXRjaCgpKQog ICAgICAgICBlbGlmIGFjdHVhbF9hdWRpbyBhbmQgbm90IGV4cGVjdGVkX2F1ZGlvOgogICAgICAg ICAgICAgZmFpbHVyZXMuYXBwZW5kKHRlc3RfZmFpbHVyZXMuRmFpbHVyZU1pc3NpbmdBdWRpbygp KQpAQCAtMjU0LDcgKzI1NCw3IEBAIGNsYXNzIFNpbmdsZVRlc3RSdW5uZXIob2JqZWN0KToKIAog ICAgICMgRklYTUU6IFRoaXMgZnVuY3Rpb24gYWxzbyBjcmVhdGVzIHRoZSBpbWFnZSBkaWZmLiBN YXliZSB0aGF0IHdvcmsgc2hvdWxkCiAgICAgIyBiZSBoYW5kbGVkIGVsc2V3aGVyZT8KLSAgICBk ZWYgX2NvbXBhcmVfaW1hZ2Uoc2VsZiwgZHJpdmVyX291dHB1dCwgZXhwZWN0ZWRfZHJpdmVyX291 dHB1dCk6CisgICAgZGVmIF9jb21wYXJlX2ltYWdlKHNlbGYsIGV4cGVjdGVkX2RyaXZlcl9vdXRw dXQsIGRyaXZlcl9vdXRwdXQpOgogICAgICAgICBmYWlsdXJlcyA9IFtdCiAgICAgICAgICMgSWYg d2UgZGlkbid0IHByb2R1Y2UgYSBoYXNoIGZpbGUsIHRoaXMgdGVzdCBtdXN0IGJlIHRleHQtb25s eS4KICAgICAgICAgaWYgZHJpdmVyX291dHB1dC5pbWFnZV9oYXNoIGlzIE5vbmU6CkBAIC0yNjQs NyArMjY0LDcgQEAgY2xhc3MgU2luZ2xlVGVzdFJ1bm5lcihvYmplY3QpOgogICAgICAgICBlbGlm IG5vdCBleHBlY3RlZF9kcml2ZXJfb3V0cHV0LmltYWdlX2hhc2g6CiAgICAgICAgICAgICBmYWls dXJlcy5hcHBlbmQodGVzdF9mYWlsdXJlcy5GYWlsdXJlTWlzc2luZ0ltYWdlSGFzaCgpKQogICAg ICAgICBlbGlmIGRyaXZlcl9vdXRwdXQuaW1hZ2VfaGFzaCAhPSBleHBlY3RlZF9kcml2ZXJfb3V0 cHV0LmltYWdlX2hhc2g6Ci0gICAgICAgICAgICBkaWZmX3Jlc3VsdCA9IHNlbGYuX3BvcnQuZGlm Zl9pbWFnZShkcml2ZXJfb3V0cHV0LmltYWdlLCBleHBlY3RlZF9kcml2ZXJfb3V0cHV0LmltYWdl KQorICAgICAgICAgICAgZGlmZl9yZXN1bHQgPSBzZWxmLl9wb3J0LmRpZmZfaW1hZ2UoZXhwZWN0 ZWRfZHJpdmVyX291dHB1dC5pbWFnZSwgZHJpdmVyX291dHB1dC5pbWFnZSkKICAgICAgICAgICAg IGVycl9zdHIgPSBkaWZmX3Jlc3VsdFsyXQogICAgICAgICAgICAgIyBGSVhNRTogc2VlIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDI3NyBhbmQKICAgICAgICAgICAg ICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxOTYyOyBJbWFnZURp ZmYgZG9lc24ndApAQCAtMjk4LDcgKzI5OCw3IEBAIGNsYXNzIFNpbmdsZVRlc3RSdW5uZXIob2Jq ZWN0KToKICAgICAgICAgZm9yIGV4cGVjdGF0aW9uLCByZWZlcmVuY2VfZmlsZW5hbWUgaW4gcHV0 QWxsTWlzbWF0Y2hCZWZvcmVNYXRjaChzZWxmLl9yZWZlcmVuY2VfZmlsZXMpOgogICAgICAgICAg ICAgcmVmZXJlbmNlX3Rlc3RfbmFtZSA9IHNlbGYuX3BvcnQucmVsYXRpdmVfdGVzdF9maWxlbmFt ZShyZWZlcmVuY2VfZmlsZW5hbWUpCiAgICAgICAgICAgICByZWZlcmVuY2Vfb3V0cHV0ID0gc2Vs Zi5fZHJpdmVyLnJ1bl90ZXN0KERyaXZlcklucHV0KHJlZmVyZW5jZV90ZXN0X25hbWUsIHNlbGYu X3RpbWVvdXQsIHRlc3Rfb3V0cHV0LmltYWdlX2hhc2gsIHNob3VsZF9ydW5fcGl4ZWxfdGVzdD1U cnVlKSwgc2VsZi5fc3RvcF93aGVuX2RvbmUpCi0gICAgICAgICAgICB0ZXN0X3Jlc3VsdCA9IHNl bGYuX2NvbXBhcmVfb3V0cHV0X3dpdGhfcmVmZXJlbmNlKHRlc3Rfb3V0cHV0LCByZWZlcmVuY2Vf b3V0cHV0LCByZWZlcmVuY2VfZmlsZW5hbWUsIGV4cGVjdGF0aW9uID09ICchPScpCisgICAgICAg ICAgICB0ZXN0X3Jlc3VsdCA9IHNlbGYuX2NvbXBhcmVfb3V0cHV0X3dpdGhfcmVmZXJlbmNlKHJl ZmVyZW5jZV9vdXRwdXQsIHRlc3Rfb3V0cHV0LCByZWZlcmVuY2VfZmlsZW5hbWUsIGV4cGVjdGF0 aW9uID09ICchPScpCiAKICAgICAgICAgICAgIGlmIChleHBlY3RhdGlvbiA9PSAnIT0nIGFuZCB0 ZXN0X3Jlc3VsdC5mYWlsdXJlcykgb3IgKGV4cGVjdGF0aW9uID09ICc9PScgYW5kIG5vdCB0ZXN0 X3Jlc3VsdC5mYWlsdXJlcyk6CiAgICAgICAgICAgICAgICAgYnJlYWsKQEAgLTMwOCwxNSArMzA4 LDE1IEBAIGNsYXNzIFNpbmdsZVRlc3RSdW5uZXIob2JqZWN0KToKICAgICAgICAgdGVzdF9yZXN1 bHRfd3JpdGVyLndyaXRlX3Rlc3RfcmVzdWx0KHNlbGYuX2ZpbGVzeXN0ZW0sIHNlbGYuX3BvcnQs IHNlbGYuX3Rlc3RfbmFtZSwgdGVzdF9vdXRwdXQsIHJlZmVyZW5jZV9vdXRwdXQsIHRlc3RfcmVz dWx0LmZhaWx1cmVzKQogICAgICAgICByZXR1cm4gVGVzdFJlc3VsdChzZWxmLl90ZXN0X25hbWUs IHRlc3RfcmVzdWx0LmZhaWx1cmVzLCB0b3RhbF90ZXN0X3RpbWUgKyB0ZXN0X3Jlc3VsdC50ZXN0 X3J1bl90aW1lLCB0ZXN0X3Jlc3VsdC5oYXNfc3RkZXJyKQogCi0gICAgZGVmIF9jb21wYXJlX291 dHB1dF93aXRoX3JlZmVyZW5jZShzZWxmLCBkcml2ZXJfb3V0cHV0MSwgZHJpdmVyX291dHB1dDIs IHJlZmVyZW5jZV9maWxlbmFtZSwgbWlzbWF0Y2gpOgotICAgICAgICB0b3RhbF90ZXN0X3RpbWUg PSBkcml2ZXJfb3V0cHV0MS50ZXN0X3RpbWUgKyBkcml2ZXJfb3V0cHV0Mi50ZXN0X3RpbWUKLSAg ICAgICAgaGFzX3N0ZGVyciA9IGRyaXZlcl9vdXRwdXQxLmhhc19zdGRlcnIoKSBvciBkcml2ZXJf b3V0cHV0Mi5oYXNfc3RkZXJyKCkKKyAgICBkZWYgX2NvbXBhcmVfb3V0cHV0X3dpdGhfcmVmZXJl bmNlKHNlbGYsIHJlZmVyZW5jZV9kcml2ZXJfb3V0cHV0LCBhY3R1YWxfZHJpdmVyX291dHB1dCwg cmVmZXJlbmNlX2ZpbGVuYW1lLCBtaXNtYXRjaCk6CisgICAgICAgIHRvdGFsX3Rlc3RfdGltZSA9 IHJlZmVyZW5jZV9kcml2ZXJfb3V0cHV0LnRlc3RfdGltZSArIGFjdHVhbF9kcml2ZXJfb3V0cHV0 LnRlc3RfdGltZQorICAgICAgICBoYXNfc3RkZXJyID0gcmVmZXJlbmNlX2RyaXZlcl9vdXRwdXQu aGFzX3N0ZGVycigpIG9yIGFjdHVhbF9kcml2ZXJfb3V0cHV0Lmhhc19zdGRlcnIoKQogICAgICAg ICBmYWlsdXJlcyA9IFtdCi0gICAgICAgIGZhaWx1cmVzLmV4dGVuZChzZWxmLl9oYW5kbGVfZXJy b3IoZHJpdmVyX291dHB1dDEpKQorICAgICAgICBmYWlsdXJlcy5leHRlbmQoc2VsZi5faGFuZGxl X2Vycm9yKGFjdHVhbF9kcml2ZXJfb3V0cHV0KSkKICAgICAgICAgaWYgZmFpbHVyZXM6CiAgICAg ICAgICAgICAjIERvbid0IGNvbnRpbnVlIGFueSBtb3JlIGlmIHdlIGFscmVhZHkgaGF2ZSBjcmFz aCBvciB0aW1lb3V0LgogICAgICAgICAgICAgcmV0dXJuIFRlc3RSZXN1bHQoc2VsZi5fdGVzdF9u YW1lLCBmYWlsdXJlcywgdG90YWxfdGVzdF90aW1lLCBoYXNfc3RkZXJyKQotICAgICAgICBmYWls dXJlcy5leHRlbmQoc2VsZi5faGFuZGxlX2Vycm9yKGRyaXZlcl9vdXRwdXQyLCByZWZlcmVuY2Vf ZmlsZW5hbWU9cmVmZXJlbmNlX2ZpbGVuYW1lKSkKKyAgICAgICAgZmFpbHVyZXMuZXh0ZW5kKHNl bGYuX2hhbmRsZV9lcnJvcihyZWZlcmVuY2VfZHJpdmVyX291dHB1dCwgcmVmZXJlbmNlX2ZpbGVu YW1lPXJlZmVyZW5jZV9maWxlbmFtZSkpCiAgICAgICAgIGlmIGZhaWx1cmVzOgogICAgICAgICAg ICAgcmV0dXJuIFRlc3RSZXN1bHQoc2VsZi5fdGVzdF9uYW1lLCBmYWlsdXJlcywgdG90YWxfdGVz dF90aW1lLCBoYXNfc3RkZXJyKQogCkBAIC0zMjQsMTUgKzMyNCwxNSBAQCBjbGFzcyBTaW5nbGVU ZXN0UnVubmVyKG9iamVjdCk6CiAgICAgICAgICAgICAjIGRvbid0IGNoZWNrIHBpeGVsIHJlc3Vs dHMgZm9yIFdUUi9XSzI7IHRoZXkncmUgYnJva2VuLgogICAgICAgICAgICAgcmV0dXJuIFRlc3RS ZXN1bHQoc2VsZi5fdGVzdF9uYW1lLCBmYWlsdXJlcywgdG90YWxfdGVzdF90aW1lLCBoYXNfc3Rk ZXJyKQogCi0gICAgICAgIGlmIG5vdCBkcml2ZXJfb3V0cHV0MS5pbWFnZV9oYXNoIGFuZCBub3Qg ZHJpdmVyX291dHB1dDIuaW1hZ2VfaGFzaDoKKyAgICAgICAgaWYgbm90IHJlZmVyZW5jZV9kcml2 ZXJfb3V0cHV0LmltYWdlX2hhc2ggYW5kIG5vdCBhY3R1YWxfZHJpdmVyX291dHB1dC5pbWFnZV9o YXNoOgogICAgICAgICAgICAgZmFpbHVyZXMuYXBwZW5kKHRlc3RfZmFpbHVyZXMuRmFpbHVyZVJl ZnRlc3ROb0ltYWdlc0dlbmVyYXRlZChyZWZlcmVuY2VfZmlsZW5hbWUpKQogICAgICAgICBlbGlm IG1pc21hdGNoOgotICAgICAgICAgICAgaWYgZHJpdmVyX291dHB1dDEuaW1hZ2VfaGFzaCA9PSBk cml2ZXJfb3V0cHV0Mi5pbWFnZV9oYXNoOgorICAgICAgICAgICAgaWYgcmVmZXJlbmNlX2RyaXZl cl9vdXRwdXQuaW1hZ2VfaGFzaCA9PSBhY3R1YWxfZHJpdmVyX291dHB1dC5pbWFnZV9oYXNoOgog ICAgICAgICAgICAgICAgIGZhaWx1cmVzLmFwcGVuZCh0ZXN0X2ZhaWx1cmVzLkZhaWx1cmVSZWZ0 ZXN0TWlzbWF0Y2hEaWROb3RPY2N1cihyZWZlcmVuY2VfZmlsZW5hbWUpKQotICAgICAgICBlbGlm IGRyaXZlcl9vdXRwdXQxLmltYWdlX2hhc2ggIT0gZHJpdmVyX291dHB1dDIuaW1hZ2VfaGFzaDoK KyAgICAgICAgZWxpZiByZWZlcmVuY2VfZHJpdmVyX291dHB1dC5pbWFnZV9oYXNoICE9IGFjdHVh bF9kcml2ZXJfb3V0cHV0LmltYWdlX2hhc2g6CiAgICAgICAgICAgICBmYWlsdXJlcy5hcHBlbmQo dGVzdF9mYWlsdXJlcy5GYWlsdXJlUmVmdGVzdE1pc21hdGNoKHJlZmVyZW5jZV9maWxlbmFtZSkp CiAKICAgICAgICAgIyByZWNvbXB1dGUgaW4gY2FzZSB3ZSBhZGRlZCB0byBzdGRlcnIgZHVyaW5n IGRpZmZfaW1hZ2UKLSAgICAgICAgaGFzX3N0ZGVyciA9IGRyaXZlcl9vdXRwdXQxLmhhc19zdGRl cnIoKSBvciBkcml2ZXJfb3V0cHV0Mi5oYXNfc3RkZXJyKCkKKyAgICAgICAgaGFzX3N0ZGVyciA9 IHJlZmVyZW5jZV9kcml2ZXJfb3V0cHV0Lmhhc19zdGRlcnIoKSBvciBhY3R1YWxfZHJpdmVyX291 dHB1dC5oYXNfc3RkZXJyKCkKIAogICAgICAgICByZXR1cm4gVGVzdFJlc3VsdChzZWxmLl90ZXN0 X25hbWUsIGZhaWx1cmVzLCB0b3RhbF90ZXN0X3RpbWUsIGhhc19zdGRlcnIpCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy90ZXN0X3Jl c3VsdF93cml0ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250 cm9sbGVycy90ZXN0X3Jlc3VsdF93cml0ZXIucHkKaW5kZXggNjdmNDJlM2I2OWIyN2Q2NjI4YjEy NWZkNmNlYmE0ZTJiNzVhZjMzYi4uNTRjZGRhZmNhNTlhYmNjMzQwMDc1MjA3OTI4MGYzZmI2NjE5 NmFlNSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29u dHJvbGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3Rlc3RfcmVzdWx0X3dyaXRlci5weQpAQCAtNjks NyArNjksNyBAQCBkZWYgd3JpdGVfdGVzdF9yZXN1bHQoZmlsZXN5c3RlbSwgcG9ydCwgdGVzdF9u YW1lLCBkcml2ZXJfb3V0cHV0LAogICAgICAgICAgICAgIyBGSVhNRTogVGhpcyB3b3JrIHNob3Vs ZCBiZSBkb25lIGVhcmxpZXIgaW4gdGhlIHBpcGVsaW5lIChlLmcuLCB3aGVuIHdlIGNvbXBhcmUg aW1hZ2VzIGZvciBub24tcmVmIHRlc3RzKS4KICAgICAgICAgICAgICMgRklYTUU6IFdlIHNob3Vs ZCBhbHdheXMgaGF2ZSAyIGltYWdlcyBoZXJlLgogICAgICAgICAgICAgaWYgZHJpdmVyX291dHB1 dC5pbWFnZSBhbmQgZXhwZWN0ZWRfZHJpdmVyX291dHB1dC5pbWFnZToKLSAgICAgICAgICAgICAg ICBkaWZmX2ltYWdlLCBkaWZmX3BlcmNlbnQsIGVycl9zdHIgPSBwb3J0LmRpZmZfaW1hZ2UoZHJp dmVyX291dHB1dC5pbWFnZSwgZXhwZWN0ZWRfZHJpdmVyX291dHB1dC5pbWFnZSwgdG9sZXJhbmNl PTApCisgICAgICAgICAgICAgICAgZGlmZl9pbWFnZSwgZGlmZl9wZXJjZW50LCBlcnJfc3RyID0g cG9ydC5kaWZmX2ltYWdlKGV4cGVjdGVkX2RyaXZlcl9vdXRwdXQuaW1hZ2UsIGRyaXZlcl9vdXRw dXQuaW1hZ2UsIHRvbGVyYW5jZT0wKQogICAgICAgICAgICAgICAgIGlmIGRpZmZfaW1hZ2U6CiAg ICAgICAgICAgICAgICAgICAgIHdyaXRlci53cml0ZV9pbWFnZV9kaWZmX2ZpbGVzKGRpZmZfaW1h Z2UpCiAgICAgICAgICAgICAgICAgICAgIGZhaWx1cmUuZGlmZl9wZXJjZW50ID0gZGlmZl9wZXJj ZW50Cg==