97182 2012-09-20 01:51:40 -0700 REGRESSION: layout test results doesn't show diffs 2012-09-20 11:45:27 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P1 Blocker --- 1 rniwa dpranke ap cdumez dpranke gyuyoung.kim ojan ossy simon.fraser oldest_to_newest 724289 0 rniwa 2012-09-20 01:51:40 -0700 See http://build.webkit.org/results/EFL%20Linux%2064-bit%20Debug%20WK2/r129100%20%283410%29/results.html Even though fast/text/atsui-multiple-renderers.html is failing, we can't see the diff. The diff is there, it's just that results page doesn't seem know how to handle new actual values. 724297 1 rniwa 2012-09-20 01:56:06 -0700 This is probably a regression from http://trac.webkit.org/changeset/129047. 724298 2 rniwa 2012-09-20 01:57:34 -0700 This bug is a little tricky to fix. We used to figure out which link (e.g wav diff, png diff, txt diff, etc...) to show based on actual failures. If we're going to just report "FAIL" in actual results, then we wouldn't know which file exist. 724570 3 dpranke 2012-09-20 09:33:40 -0700 Sigh. Yeah, I think perhaps the thing to do (at least for the moment) is to go back to using IMAGE+TEXT, TEXT, and AUDIO internally and still store those values in the JSON file, but keep Failure as the only expectation in the TestExpectations file, so that it will automatically address all of these. Longer term this means that we should probably consolidate IMAGE+TEXT, TEXT, and AUDIO with the TestFailures types so that we only have one list of detailed failures, and continue mapping those onto a smaller list of expectation types. It wouldn't be a bad thing if we were pushing more details about how exactly tests were failing into results.json (so you could see when checksums failed but diffs passed, etc.). 724574 4 dpranke 2012-09-20 09:34:46 -0700 An alternative is to have results.html probe for the various -actual files and -diff files and only display the ones it finds, but this feels less good to me, because we have the information, we're just throwing it away and then trying to recover from throwing it away. 724578 5 ojan 2012-09-20 09:38:57 -0700 (In reply to comment #3) > Longer term this means that we should probably consolidate IMAGE+TEXT, TEXT, and AUDIO with the TestFailures types so that we only have one list of detailed failures, and continue mapping those onto a smaller list of expectation types. It wouldn't be a bad thing if we were pushing more details about how exactly tests were failing into results.json (so you could see when checksums failed but diffs passed, etc.). I agree. I think this is the better direction to go. 724649 6 dpranke 2012-09-20 10:57:41 -0700 *** Bug 97238 has been marked as a duplicate of this bug. *** 724660 7 ap 2012-09-20 11:02:34 -0700 Not seeing failure diffs basically blocks WebKit development. Can this be addressed today, or should r129047 be rolled out? 724709 8 164956 dpranke 2012-09-20 11:36:04 -0700 Created attachment 164956 Patch 724711 9 164956 dpranke 2012-09-20 11:41:16 -0700 Comment on attachment 164956 Patch Clearing flags on attachment: 164956 Committed r129148: <http://trac.webkit.org/changeset/129148> 724712 10 dpranke 2012-09-20 11:41:20 -0700 All reviewed patches have been landed. Closing bug. 724715 11 dpranke 2012-09-20 11:45:27 -0700 This should fix the issues. Unfortunately, we had unit tests for both sides of this (generating both sides of this) but not an integration test that the correct data propagated all the way through. It's not actually clear how to do such an integration test, unfortunately, but I'm going to keep thinking about it since it seems like a pretty important thing to ensure stays working ... 164956 2012-09-20 11:36:04 -0700 2012-09-20 11:41:16 -0700 Patch bug-97182-20120920113529.patch text/plain 9532 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MTQyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjMzZTZlZDBjNWYxZmNhZDRmNjljMDQ5MWNlYWJhYTEy ZDU2YzdlYi4uNGJlNzMxMWE3ZTY5ZWRjM2I4MDM0NzNmNzJkZDEyNTBhMTU0NTY3NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDEyLTA5LTIwICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFJFR1JFU1NJT046IGxheW91dCB0ZXN0IHJlc3VsdHMgZG9lc24ndCBzaG93IGRpZmZz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzE4Mgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdvIGJhY2sg dG8gc3RvcmluZyBURVhULCBBVURJTywgYW5kIElNQUdFK1RFWFQgaW4gcmVzdWx0cy5qc29uCisg ICAgICAgIHNvIHRoYXQgcmVzdWx0cy5odG1sIChhbmQgaG9wZWZ1bGx5IGdhcmRlbi1vLW1hdGlj KSBjYW4KKyAgICAgICAgZGV0ZXJtaW5lIHdoaWNoIHRoaW5ncyBhY3R1YWxseSBmYWlsZWQuIEhv d2V2ZXIsIHdlIGtlZXAgbWFwcGluZworICAgICAgICB0aGVzZSByZXN1bHRzIHRvIEZhaWx1cmUg c28gdGhhdCB3ZSBzdGlsbCBvbmx5IGhhdmUgYSBzaW5nbGUKKyAgICAgICAgZXhwZWN0YXRpb24g dHlwZSBmb3IgdGhlbS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2xheW91dF9wYWNrYWdlL2pzb25fbGF5b3V0X3Jlc3VsdHNfZ2VuZXJhdG9yLnB5OgorICAgICAg ICAoSlNPTkxheW91dFJlc3VsdHNHZW5lcmF0b3IpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weToKKyAgICAgICAgKFRl c3RFeHBlY3RhdGlvblBhcnNlcik6CisgICAgICAgIChUZXN0RXhwZWN0YXRpb25zKToKKyAgICAg ICAgKFRlc3RFeHBlY3RhdGlvbnMucmVzdWx0X3dhc19leHBlY3RlZCk6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZmFpbHVyZXMucHk6CisgICAg ICAgIChkZXRlcm1pbmVfcmVzdWx0X3R5cGUpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5OgorICAgICAg ICAoTWFpblRlc3QudGVzdF9taXNzaW5nX2FuZF91bmV4cGVjdGVkX3Jlc3VsdHMpOgorICAgICAg ICAoTWFpblRlc3QudGVzdF9yZXRyeWluZ19hbmRfZmxha3lfdGVzdHMpOgorCiAyMDEyLTA5LTIw ICBTdGVwaGVuIENoZW5uZXkgIDxzY2hlbm5leUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0No cm9taXVtXSBEUlQgZG9lcyBub3Qgc3VwcG9ydCAtLWR1bXAtYWxsLXBpeGVscyBmbGFnCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2Fn ZS9qc29uX2xheW91dF9yZXN1bHRzX2dlbmVyYXRvci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fbGF5b3V0X3Jlc3VsdHNfZ2VuZXJh dG9yLnB5CmluZGV4IGFhNWNkYzYwZjMwMGZhM2YzZGRkNzA2NzRjMTZiNTlhZWEzNmZiNTQuLmYy NzdjOTNkZTgxM2IxYTU4ZjU3N2NjNmQyYjI5ODYwOGU4M2I2N2EgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fbGF5b3V0 X3Jlc3VsdHNfZ2VuZXJhdG9yLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fbGF5b3V0X3Jlc3VsdHNfZ2VuZXJhdG9yLnB5CkBA IC00MCwxNSArNDAsMTUgQEAgY2xhc3MgSlNPTkxheW91dFJlc3VsdHNHZW5lcmF0b3IoanNvbl9y ZXN1bHRzX2dlbmVyYXRvci5KU09OUmVzdWx0c0dlbmVyYXRvckJhc2UKICAgICAjIEFkZGl0aW9u YWwgSlNPTiBmaWVsZHMuCiAgICAgV09OVEZJWCA9ICJ3b250Zml4Q291bnRzIgogCi0gICAgIyBO b3RlIHRoYXQgdGhlcmUgdXNlZCB0byBiZSBhbiAiQSIgZm9yIGF1ZGlvIGZhaWx1cmVzIGFuZCBh ICJaIiBmb3IgSU1BR0UrVEVYVCBmYWlsdXJlcy4KLQogICAgIEZBSUxVUkVfVE9fQ0hBUiA9IHt0 ZXN0X2V4cGVjdGF0aW9ucy5QQVNTOiBqc29uX3Jlc3VsdHNfZ2VuZXJhdG9yLkpTT05SZXN1bHRz R2VuZXJhdG9yQmFzZS5QQVNTX1JFU1VMVCwKICAgICAgICAgICAgICAgICAgICAgICAgdGVzdF9l eHBlY3RhdGlvbnMuU0tJUDoganNvbl9yZXN1bHRzX2dlbmVyYXRvci5KU09OUmVzdWx0c0dlbmVy YXRvckJhc2UuU0tJUF9SRVNVTFQsCiAgICAgICAgICAgICAgICAgICAgICAgIHRlc3RfZXhwZWN0 YXRpb25zLkNSQVNIOiAiQyIsCiAgICAgICAgICAgICAgICAgICAgICAgIHRlc3RfZXhwZWN0YXRp b25zLlRJTUVPVVQ6ICJUIiwKLSAgICAgICAgICAgICAgICAgICAgICAgdGVzdF9leHBlY3RhdGlv bnMuRkFJTDogIkYiLAogICAgICAgICAgICAgICAgICAgICAgICB0ZXN0X2V4cGVjdGF0aW9ucy5J TUFHRTogIkkiLAotICAgICAgICAgICAgICAgICAgICAgICB0ZXN0X2V4cGVjdGF0aW9ucy5NSVNT SU5HOiAiTyJ9CisgICAgICAgICAgICAgICAgICAgICAgIHRlc3RfZXhwZWN0YXRpb25zLlRFWFQ6 ICJGIiwKKyAgICAgICAgICAgICAgICAgICAgICAgdGVzdF9leHBlY3RhdGlvbnMuQVVESU86ICJB IiwKKyAgICAgICAgICAgICAgICAgICAgICAgdGVzdF9leHBlY3RhdGlvbnMuTUlTU0lORzogIk8i LAorICAgICAgICAgICAgICAgICAgICAgICB0ZXN0X2V4cGVjdGF0aW9ucy5JTUFHRV9QTFVTX1RF WFQ6ICJaIn0KIAogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0LCBidWlsZGVyX25hbWUsIGJ1 aWxkX25hbWUsIGJ1aWxkX251bWJlciwKICAgICAgICAgcmVzdWx0c19maWxlX2Jhc2VfcGF0aCwg YnVpbGRlcl9iYXNlX3VybCwKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weQppbmRleCBkNGI5 Zjk2OTQ1Y2Y1NWUyZGU5YWVlNWNlN2M1ZmVhMTgxMTU2NmY1Li43ODkwZTk4MGUzOTRkYTA1MjY5 ZTY0NTczY2NjOGFkNzU5NGFkMjMxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5CkBA IC00MCw5ICs0MCw2IEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIAogCiAj IFRlc3QgZXhwZWN0YXRpb24gYW5kIG1vZGlmaWVyIGNvbnN0YW50cy4KLSMgVEVYVCwgSU1BR0Vf UExVU19URVhULCBhbmQgQVVESU8gYXJlIG5vIGxvbmdlciB1c2VkIGluIG5ldyB0ZXN0IHJ1bnMg YnV0Ci0jIHdlIGtlZXAgdGhlbSBhcm91bmQgZm9yIG5vdyBzbyB3ZSBjYW4gcGFyc2Ugb2xkIHJl c3VsdHMuanNvbiBlbnRyaWVzIGFuZCB0bwotIyBhdm9pZCBjaGFuZ2luZyB0aGUgbnVtYmVyaW5n IGZvciB0aGUgY29uc3RhbnRzLgogIwogIyBGSVhNRTogcmFuZ2UoKSBzdGFydHMgd2l0aCAwIHdo aWNoIG1ha2VzIGlmIGV4cGVjdGF0aW9uIGNoZWNrcyBoYXJkZXIKICMgYXMgUEFTUyBpcyAwLgpA QCAtMjg2LDcgKzI4Myw4IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvblBhcnNlcihvYmplY3QpOgog ICAgICAgICAnV29udEZpeCc6ICdXT05URklYJywKICAgICB9CiAKLSAgICBfaW52ZXJ0ZWRfZXhw ZWN0YXRpb25fdG9rZW5zID0gZGljdCgodmFsdWUsIG5hbWUpIGZvciBuYW1lLCB2YWx1ZSBpbiBf ZXhwZWN0YXRpb25fdG9rZW5zLml0ZXJpdGVtcygpKQorICAgIF9pbnZlcnRlZF9leHBlY3RhdGlv bl90b2tlbnMgPSBkaWN0KFsodmFsdWUsIG5hbWUpIGZvciBuYW1lLCB2YWx1ZSBpbiBfZXhwZWN0 YXRpb25fdG9rZW5zLml0ZXJpdGVtcygpXSArCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgWygnVEVYVCcsICdGYWlsdXJlJyksICgnSU1BR0UrVEVYVCcsICdGYWlsdXJl JyksICgnQVVESU8nLCAnRmFpbHVyZScpXSkKIAogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBf dG9rZW5pemVfbGluZV91c2luZ19uZXdfZm9ybWF0KGNscywgZmlsZW5hbWUsIGV4cGVjdGF0aW9u X3N0cmluZywgbGluZV9udW1iZXIpOgpAQCAtNzkxLDggKzc4OSwxMSBAQCBjbGFzcyBUZXN0RXhw ZWN0YXRpb25zKG9iamVjdCk6CiAKICAgICAjIEZJWE1FOiBVcGRhdGUgdG8gbmV3IHN5bnRheCBv bmNlIHRoZSBvbGQgZm9ybWF0IGlzIG5vIGxvbmdlciBzdXBwb3J0ZWQuCiAgICAgRVhQRUNUQVRJ T05TID0geydwYXNzJzogUEFTUywKKyAgICAgICAgICAgICAgICAgICAgJ2F1ZGlvJzogQVVESU8s CiAgICAgICAgICAgICAgICAgICAgICdmYWlsJzogRkFJTCwKICAgICAgICAgICAgICAgICAgICAg J2ltYWdlJzogSU1BR0UsCisgICAgICAgICAgICAgICAgICAgICdpbWFnZSt0ZXh0JzogSU1BR0Vf UExVU19URVhULAorICAgICAgICAgICAgICAgICAgICAndGV4dCc6IFRFWFQsCiAgICAgICAgICAg ICAgICAgICAgICd0aW1lb3V0JzogVElNRU9VVCwKICAgICAgICAgICAgICAgICAgICAgJ2NyYXNo JzogQ1JBU0gsCiAgICAgICAgICAgICAgICAgICAgICdtaXNzaW5nJzogTUlTU0lOR30KQEAgLTgw Miw2ICs4MDMsOSBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25zKG9iamVjdCk6CiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFBBU1M6ICgncGFzc2VzJywgJ3Bhc3NlZCcsICcnKSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRkFJTDogKCdmYWlsdXJlcycsICdmYWlsZWQn LCAnJyksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIElNQUdFOiAoJ2ltYWdlLW9u bHkgZmFpbHVyZXMnLCAnZmFpbGVkJywgJyAoaW1hZ2UgZGlmZiknKSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgVEVYVDogKCd0ZXh0LW9ubHkgZmFpbHVyZXMnLCAnZmFpbGVkJywg JyAodGV4dCBkaWZmKScpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJTUFHRV9Q TFVTX1RFWFQ6ICgnaW1hZ2UgYW5kIHRleHQgZmFpbHVyZXMnLCAnZmFpbGVkJywgJyAoaW1hZ2Ug YW5kIHRleHQgZGlmZiknKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQVVESU86 ICgnYXVkaW8gZmFpbHVyZXMnLCAnZmFpbGVkJywgJyAoYXVkaW8gZGlmZiknKSwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgQ1JBU0g6ICgnY3Jhc2hlcycsICdjcmFzaGVkJywgJycp LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBUSU1FT1VUOiAoJ3RpbWVvdXRzJywg J3RpbWVkIG91dCcsICcnKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTUlTU0lO RzogKCdubyBleHBlY3RlZCByZXN1bHRzIGZvdW5kJywgJ25vIGV4cGVjdGVkIHJlc3VsdCBmb3Vu ZCcsICcnKX0KQEAgLTgzOSw2ICs4NDMsOCBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25zKG9iamVj dCk6CiAgICAgICAgICAgICB0ZXN0X2lzX3NraXBwZWQ6IHdoZXRoZXIgdGVzdCB3YXMgbWFya2Vk IGFzIFNLSVAiIiIKICAgICAgICAgaWYgcmVzdWx0IGluIGV4cGVjdGVkX3Jlc3VsdHM6CiAgICAg ICAgICAgICByZXR1cm4gVHJ1ZQorICAgICAgICBpZiByZXN1bHQgaW4gKFRFWFQsIElNQUdFX1BM VVNfVEVYVCwgQVVESU8pIGFuZCAoRkFJTCBpbiBleHBlY3RlZF9yZXN1bHRzKToKKyAgICAgICAg ICAgIHJldHVybiBUcnVlCiAgICAgICAgIGlmIHJlc3VsdCA9PSBNSVNTSU5HIGFuZCB0ZXN0X25l ZWRzX3JlYmFzZWxpbmluZzoKICAgICAgICAgICAgIHJldHVybiBUcnVlCiAgICAgICAgIGlmIHJl c3VsdCA9PSBTS0lQIGFuZCB0ZXN0X2lzX3NraXBwZWQ6CmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9mYWlsdXJlcy5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2ZhaWx1cmVzLnB5Cmlu ZGV4IDk2NjI4YWZjM2QzZmQyY2EwNmNmZGU4YTk4YjNkYzM1YWQ4YTg3ZmQuLjEzZDQwMDFiNTJh ZWEwYzE5ZjMwMzk0ZjQwNjhhYjJkMWJmNzc4NTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2ZhaWx1cmVzLnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2ZhaWx1cmVzLnB5CkBA IC02MiwxMCArNjIsMTggQEAgZGVmIGRldGVybWluZV9yZXN1bHRfdHlwZShmYWlsdXJlX2xpc3Qp OgogICAgICAgICAgIEZhaWx1cmVNaXNzaW5nQXVkaW8gaW4gZmFpbHVyZV90eXBlcyk6CiAgICAg ICAgIHJldHVybiB0ZXN0X2V4cGVjdGF0aW9ucy5NSVNTSU5HCiAgICAgZWxzZToKLSAgICAgICAg aWYgRmFpbHVyZVRleHRNaXNtYXRjaCBpbiBmYWlsdXJlX3R5cGVzIG9yIEZhaWx1cmVBdWRpb01p c21hdGNoIGluIGZhaWx1cmVfdHlwZXM6Ci0gICAgICAgICAgICByZXR1cm4gdGVzdF9leHBlY3Rh dGlvbnMuRkFJTAotICAgICAgICBlbGlmIEZhaWx1cmVJbWFnZUhhc2hJbmNvcnJlY3QgaW4gZmFp bHVyZV90eXBlcyBvciBGYWlsdXJlSW1hZ2VIYXNoTWlzbWF0Y2ggaW4gZmFpbHVyZV90eXBlcyBv ciBpc19yZWZ0ZXN0X2ZhaWx1cmUoZmFpbHVyZV9saXN0KToKKyAgICAgICAgaXNfdGV4dF9mYWls dXJlID0gRmFpbHVyZVRleHRNaXNtYXRjaCBpbiBmYWlsdXJlX3R5cGVzCisgICAgICAgIGlzX2lt YWdlX2ZhaWx1cmUgPSAoRmFpbHVyZUltYWdlSGFzaEluY29ycmVjdCBpbiBmYWlsdXJlX3R5cGVz IG9yCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgRmFpbHVyZUltYWdlSGFzaE1pc21hdGNo IGluIGZhaWx1cmVfdHlwZXMpCisgICAgICAgIGlzX2F1ZGlvX2ZhaWx1cmUgPSAoRmFpbHVyZUF1 ZGlvTWlzbWF0Y2ggaW4gZmFpbHVyZV90eXBlcykKKyAgICAgICAgaWYgaXNfdGV4dF9mYWlsdXJl IGFuZCBpc19pbWFnZV9mYWlsdXJlOgorICAgICAgICAgICAgcmV0dXJuIHRlc3RfZXhwZWN0YXRp b25zLklNQUdFX1BMVVNfVEVYVAorICAgICAgICBlbGlmIGlzX3RleHRfZmFpbHVyZToKKyAgICAg ICAgICAgIHJldHVybiB0ZXN0X2V4cGVjdGF0aW9ucy5URVhUCisgICAgICAgIGVsaWYgaXNfaW1h Z2VfZmFpbHVyZSBvciBpc19yZWZ0ZXN0X2ZhaWx1cmUoZmFpbHVyZV9saXN0KToKICAgICAgICAg ICAgIHJldHVybiB0ZXN0X2V4cGVjdGF0aW9ucy5JTUFHRQorICAgICAgICBlbGlmIGlzX2F1ZGlv X2ZhaWx1cmU6CisgICAgICAgICAgICByZXR1cm4gdGVzdF9leHBlY3RhdGlvbnMuQVVESU8KICAg ICAgICAgZWxzZToKICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoInVuY2xhc3NpZmlhYmxl IHNldCBvZiBmYWlsdXJlczogIgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICArIHN0cihm YWlsdXJlX3R5cGVzKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3Qu cHkKaW5kZXggMWFiYzNjYWRhNzAyMGY1ZTMwNTk1MmQ4MWE3Y2Y3ZmQzNDcwY2U5Yy4uMTdhMTJm YzZiODJiMWQyYjkzMDUzODU3OTY5OGQzYjYzMzM0MzMxYiAxMDA3NTUKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRl c3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtp dF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkKQEAgLTU0OSw3ICs1NDksNyBAQCBjbGFzcyBNYWlu VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSwgU3RyZWFtVGVzdGluZ01peGluKToKICAgICAgICAgZmls ZV9saXN0ID0gaG9zdC5maWxlc3lzdGVtLndyaXR0ZW5fZmlsZXMua2V5cygpCiAgICAgICAgIGZp bGVfbGlzdC5yZW1vdmUoJy90bXAvbGF5b3V0LXRlc3QtcmVzdWx0cy90ZXN0c19ydW4wLnR4dCcp CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHJlcywgMSkKLSAgICAgICAgZXhwZWN0ZWRfdG9r ZW4gPSAnInVuZXhwZWN0ZWQiOnsidGV4dC1pbWFnZS1jaGVja3N1bS5odG1sIjp7ImV4cGVjdGVk IjoiUEFTUyIsImFjdHVhbCI6IkZBSUwifSwibWlzc2luZ190ZXh0Lmh0bWwiOnsiZXhwZWN0ZWQi OiJQQVNTIiwiaXNfbWlzc2luZ190ZXh0Ijp0cnVlLCJhY3R1YWwiOiJNSVNTSU5HIn0nCisgICAg ICAgIGV4cGVjdGVkX3Rva2VuID0gJyJ1bmV4cGVjdGVkIjp7InRleHQtaW1hZ2UtY2hlY2tzdW0u aHRtbCI6eyJleHBlY3RlZCI6IlBBU1MiLCJhY3R1YWwiOiJURVhUIn0sIm1pc3NpbmdfdGV4dC5o dG1sIjp7ImV4cGVjdGVkIjoiUEFTUyIsImlzX21pc3NpbmdfdGV4dCI6dHJ1ZSwiYWN0dWFsIjoi TUlTU0lORyJ9JwogICAgICAgICBqc29uX3N0cmluZyA9IGhvc3QuZmlsZXN5c3RlbS5yZWFkX3Rl eHRfZmlsZSgnL3RtcC9sYXlvdXQtdGVzdC1yZXN1bHRzL2Z1bGxfcmVzdWx0cy5qc29uJykKICAg ICAgICAgc2VsZi5hc3NlcnRUcnVlKGpzb25fc3RyaW5nLmZpbmQoZXhwZWN0ZWRfdG9rZW4pICE9 IC0xKQogICAgICAgICBzZWxmLmFzc2VydFRydWUoanNvbl9zdHJpbmcuZmluZCgnIm51bV9yZWdy ZXNzaW9ucyI6MScpICE9IC0xKQpAQCAtNzY0LDcgKzc2NCw3IEBAIGNsYXNzIE1haW5UZXN0KHVu aXR0ZXN0LlRlc3RDYXNlLCBTdHJlYW1UZXN0aW5nTWl4aW4pOgogICAgICAgICBzZWxmLmFzc2Vy dEVxdWFscyhyZXMsIDEpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnQ2xvYmJlcmluZyBvbGQg cmVzdWx0cycgaW4gZXJyLmdldHZhbHVlKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnZmxh a3kvdGV4dC5odG1sJyBpbiBlcnIuZ2V0dmFsdWUoKSkKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVl KCdVbmV4cGVjdGVkIGZhaWx1cmVzJyBpbiBvdXQuZ2V0dmFsdWUoKSkKKyAgICAgICAgc2VsZi5h c3NlcnRUcnVlKCdVbmV4cGVjdGVkIHRleHQtb25seSBmYWlsdXJlcycgaW4gb3V0LmdldHZhbHVl KCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoJ1VuZXhwZWN0ZWQgZmxha2luZXNzJyBpbiBv dXQuZ2V0dmFsdWUoKSkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGhvc3QuZmlsZXN5c3RlbS5l eGlzdHMoJy90bXAvbGF5b3V0LXRlc3QtcmVzdWx0cy9mYWlsdXJlcy9mbGFreS90ZXh0LWFjdHVh bC50eHQnKSkKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShob3N0LmZpbGVzeXN0ZW0uZXhpc3Rz KCdyZXRyaWVzJykpCg==