214006 2020-07-06 13:57:55 -0700 W3C test importer should be able to update just the imported tests (without adding new directories for different test specs.) 2023-12-15 04:42:33 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=213927 InRadar P2 Normal --- 207734 1 clopez gsnedders cdumez clopez ews-watchlist glenn gsnedders jbedard slewis webkit-bug-importer youennf oldest_to_newest 1669153 0 clopez 2020-07-06 13:57:55 -0700 The process for updating all the WPT imported tests its the following (AFAIK): 1. Raise the WPT commit in LayoutTests/imported/w3c/resources/TestRepositories 2. Run the importer script: Tools/Scripts/import-w3c-tests The problem is that when you try this, then you find that the importer script adds many new directories from test suites still not imported. Basically is adding every directory from wpt that its not explicitly listed as skipped at LayoutTests/imported/w3c/resources/import-expectations.json I think it would be useful to have a way of telling the tool to only update the tests already imported but without adding new folders for unrelated tests. This is perhaps a happening since r206993 but not sure. 1669194 1 403627 clopez 2020-07-06 15:20:56 -0700 Created attachment 403627 Patch 1669301 2 403656 clopez 2020-07-06 19:50:43 -0700 Created attachment 403656 Patch 1669420 3 clopez 2020-07-07 09:20:02 -0700 Note... this is supposed to be executed as: 1. Raise the WPT commit in LayoutTests/imported/w3c/resources/TestRepositories 2. Run the importer script (without passing any folder name, only the update-import switch): Tools/Scripts/import-w3c-tests --update-import -v 1690549 4 webkit-bug-importer 2020-09-21 15:36:41 -0700 <rdar://problem/69332004> 1964997 5 gsnedders 2023-07-04 09:01:03 -0700 To make sure I understand what the goal here is: Unlike passing a set of test paths on the command line, the aim is to simply update an existing partial import of WPT without importing test suites for new/other specifications? If so, I think I'd rather than the current patch here: * Instead of using the presence of META.yml, just look at top-level directories of WPT and direct children of css/. * Add everything we're skipping to import-expectations.json (as "skip", to make it clear what we're not importing). That said, could we not achieve the same goal by having the top-level marked as "skip" and then just allowlisting everything we want to import? Though that does have the one downside of making it easy to miss new directories we actually do want to import, versus explicitly adding everything new as "skip". 1988010 6 gsnedders 2023-10-27 08:24:16 -0700 Pull request: https://github.com/WebKit/WebKit/pull/19642 1999878 7 ews-feeder 2023-12-15 04:42:31 -0800 Committed 272109@main (e5fd5e058c53): <https://commits.webkit.org/272109@main> Reviewed commits have been landed. Closing PR #19642 and removing active labels. 403627 2020-07-06 15:20:56 -0700 2020-07-06 19:50:22 -0700 Patch bug-214006-20200707002055.patch text/plain 15562 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzOTg0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjI0N2E5MmE3Y2VkOTM1NDhiMjdkN2Q1NDRiOGFmZDRh NWZkMTVlOC4uZGM2M2Y1NmU0MjI5MzUxN2Y3YzU4Yzk2NDQwNGQ0NDU0YjdlMzcwYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3 IEBACisyMDIwLTA3LTA2ICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFczQyB0ZXN0IGltcG9ydGVyIHNob3VsZCBiZSBhYmxlIHRvIHVw ZGF0ZSBqdXN0IHRoZSBpbXBvcnRlZCB0ZXN0cyAod2l0aG91dCBhZGRpbmcgbmV3IGRpcmVjdG9y aWVzIGZvciBkaWZmZXJlbnQgdGVzdCBzcGVjcy4pCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQwMDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGFkZHMgYSBuZXcgLS11cGRhdGUtaW1wb3J0IHN3 aXRjaCBmb3IgdGhlIHNjcmlwdCBpbXBvcnQtdzNjLXRlc3RzLgorCisgICAgICAgIEluIHRoaXMg bW9kZSwgdGhlIHNjcmlwdCBidWlsZHMgYSBsaXN0IG9mIGFscmVhZHkgaW1wb3J0ZWQgc3VpdGVz IGJ5IGNoZWNraW5nIHdoaWNoIGRpcmVjdG9yaWVzIGNvbnRhaW4gYSBmaWxlCisgICAgICAgIG5h bWVkIE1FVEEueW1sICh3aGljaCBpdHMgdGhlIGRlLWZhY3RvIHdheSBvbiBXUFQgZm9yIGRlY2xh cmluZyB0aGF0IGEgZm9sZGVyIGNvbnRhaW5zIHRlc3RzIGZvciBhIHNwZWMpLgorCisgICAgICAg IFRoZW4gaXQgd2lsbCBhZGQgdG8gdGhlIGxpc3Qgb2YgZGlyZWN0b3JpZXMgdG8gaW1wb3J0IGFs bCB0aGUgZGlyZWN0b3JpZXMgYmVsb25naW5nIHRvIGRldGVjdGVkIGltcG9ydGVkIHRlc3Qgc3Vp dGVzICh1bnNraXBwaW5nIHRoZW0gaWYgbmVlZGVkKS4KKyAgICAgICAgSXQgd2lsbCBhbHNvIGFk ZCBhbGwgdGhlIGN1cnJlbnQgaW1wb3J0ZWQgZGlyZWN0b3JpZXMuIEZpbmFsbHkgaXQgd2lsbCBz a2lwIGFsbCB0aGUgdGVzdCBzdWl0ZXMgZGV0ZWN0ZWQgaW4gdGhlIHVwc3RyZWFtIFdQVCBjaGVj a291dCB0aGF0IGFyZSBzdGlsbCBub3QgaW1wb3J0ZWQuCisKKyAgICAgICAgVGhhdCB3YXkgaXQg YmVjb21lcyBwb3NzaWJsZSB0byB1cGRhdGUgYW4gV1BUIGRpcmVjdG9yeSBsaWtlIGNzcy8gdGhh dCBjb250YWlucyBzZXZlcmFsIHN1YiB0ZXN0LXN1aXRlcywgYW5kIG9ubHkgdXBkYXRlIHRoZSBk aXJlY3RvcmllcyBmb3IgdGhlIHN1aXRlcyBhbHJlYWR5IGltcG9ydGVkLgorICAgICAgICBJdCBh bHNvIGJlY29tZXMgcG9zc2libGUgdG8gdXBkYXRlIHRoZSBnZW5lcmFsIFdQVCBjaGVja291dCB3 aXRob3V0IGFkZGluZyBuZXcgdGVzdCBzdWl0ZXMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L3czYy90ZXN0X2Rvd25sb2FkZXIucHk6CisgICAgICAgIChUZXN0RG93bmxvYWRlci5kZWZh dWx0X29wdGlvbnMpOgorICAgICAgICAoVGVzdERvd25sb2FkZXIuX19pbml0X18pOgorICAgICAg ICAoVGVzdERvd25sb2FkZXIuX2ZpbmRfdGVzdF9zdWl0ZXMpOgorICAgICAgICAoVGVzdERvd25s b2FkZXIuX2ZpbmRfdGVzdF9zdWl0ZXMuaXNfbWV0YV95bWwpOgorICAgICAgICAoVGVzdERvd25s b2FkZXIpOgorICAgICAgICAoVGVzdERvd25sb2FkZXIuX3NraXBfbm90X2ltcG9ydGVkX3N1aXRl cyk6CisgICAgICAgIChUZXN0RG93bmxvYWRlci5fYWRkX2ltcG9ydGVkX3N1aXRlcyk6CisgICAg ICAgIChUZXN0RG93bmxvYWRlci5fdW5za2lwX2ltcG9ydGVkX2RpcnMpOgorICAgICAgICAoVGVz dERvd25sb2FkZXIuY29weV90ZXN0cyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS93M2Mv dGVzdF9pbXBvcnRlci5weToKKyAgICAgICAgKFRlc3RJbXBvcnRlci50ZXN0X2Rvd25sb2FkZXIp OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXJfdW5pdHRlc3Qu cHk6CisgICAgICAgICh0ZXN0X3RlbXBsYXRlX3Rlc3QpOgorICAgICAgICAodGVzdF91cGRhdGVf aW1wb3J0KToKKwogMjAyMC0wNy0wNiAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5j b20+CiAKICAgICAgICAgW3Rlc3Qtd2Via2l0cHldIFVzZSBwbGF0Zm9ybSBhcmNoaXRlY3R1cmUK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfZG93bmxvYWRlci5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfZG93bmxvYWRlci5weQppbmRleCA0 M2JlMzJmYWYwMTUyMWNlZjg2N2Y0YTQyNjhhNjlkNWQzZmQxNDc1Li5kOTM1YmQ5ZWVlMTEwMGVk Njk0YzNiZDA0MTRjNzUyYjFmMDZiZjAxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3czYy90ZXN0X2Rvd25sb2FkZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93 M2MvdGVzdF9kb3dubG9hZGVyLnB5CkBAIC00NSw2ICs0NSw3IEBAIGNsYXNzIFRlc3REb3dubG9h ZGVyKG9iamVjdCk6CiAgICAgICAgIG9wdGlvbnMuZmV0Y2ggPSBUcnVlCiAgICAgICAgIG9wdGlv bnMudmVyYm9zZSA9IEZhbHNlCiAgICAgICAgIG9wdGlvbnMuaW1wb3J0X2FsbCA9IEZhbHNlCisg ICAgICAgIG9wdGlvbnMudXBkYXRlX2ltcG9ydCA9IEZhbHNlCiAgICAgICAgIHJldHVybiBvcHRp b25zCiAKICAgICBAc3RhdGljbWV0aG9kCkBAIC02OSw4ICs3MCw4IEBAIGNsYXNzIFRlc3REb3du bG9hZGVyKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLnBhdGhzX3RvX3NraXAuZXh0ZW5kKFtz ZWxmLl9maWxlc3lzdGVtLmpvaW4odGVzdF9yZXBvc2l0b3J5WyduYW1lJ10sIHBhdGgpIGZvciBw YXRoIGluIHRlc3RfcmVwb3NpdG9yeVsncGF0aHNfdG9fc2tpcCddXSkKICAgICAgICAgICAgIHNl bGYucGF0aHNfdG9faW1wb3J0LmV4dGVuZChbc2VsZi5fZmlsZXN5c3RlbS5qb2luKHRlc3RfcmVw b3NpdG9yeVsnbmFtZSddLCBwYXRoKSBmb3IgcGF0aCBpbiB0ZXN0X3JlcG9zaXRvcnlbJ3BhdGhz X3RvX2ltcG9ydCddXSkKIAotICAgICAgICB3ZWJraXRfZmluZGVyID0gV2ViS2l0RmluZGVyKHNl bGYuX2ZpbGVzeXN0ZW0pCi0gICAgICAgIHNlbGYuaW1wb3J0X2V4cGVjdGF0aW9uc19wYXRoID0g d2Via2l0X2ZpbmRlci5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoJ0xheW91dFRlc3RzJywgJ2ltcG9y dGVkJywgJ3czYycsICdyZXNvdXJjZXMnLCAnaW1wb3J0LWV4cGVjdGF0aW9ucy5qc29uJykKKyAg ICAgICAgc2VsZi53ZWJraXRfZmluZGVyID0gV2ViS2l0RmluZGVyKHNlbGYuX2ZpbGVzeXN0ZW0p CisgICAgICAgIHNlbGYuaW1wb3J0X2V4cGVjdGF0aW9uc19wYXRoID0gc2VsZi53ZWJraXRfZmlu ZGVyLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgnTGF5b3V0VGVzdHMnLCAnaW1wb3J0ZWQnLCAndzNj JywgJ3Jlc291cmNlcycsICdpbXBvcnQtZXhwZWN0YXRpb25zLmpzb24nKQogICAgICAgICBpZiBu b3Qgc2VsZi5fZmlsZXN5c3RlbS5pc2ZpbGUoc2VsZi5pbXBvcnRfZXhwZWN0YXRpb25zX3BhdGgp OgogICAgICAgICAgICAgX2xvZy53YXJuaW5nKCdVbmFibGUgdG8gcmVhZCBpbXBvcnQgZXhwZWN0 YXRpb24gZmlsZTogJXMnICUgc2VsZi5pbXBvcnRfZXhwZWN0YXRpb25zX3BhdGgpCiAgICAgICAg IGlmIG5vdCBzZWxmLl9vcHRpb25zLmltcG9ydF9hbGw6CkBAIC0xMjEsNiArMTIyLDM2IEBAIGNs YXNzIFRlc3REb3dubG9hZGVyKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLl9maWxlc3lzdGVt LnJtdHJlZShkaXJlY3RvcnkpCiAgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0ubWF5YmVfbWFrZV9k aXJlY3RvcnkoZGlyZWN0b3J5KQogCisgICAgZGVmIF9maW5kX3Rlc3Rfc3VpdGVzKHNlbGYsIGRp cik6CisgICAgICAgIGRlZiBpc19tZXRhX3ltbChmaWxlc3lzdGVtLCBkaXJuYW1lLCBmaWxlbmFt ZSk6CisgICAgICAgICAgICByZXR1cm4gZmlsZW5hbWUuZW5kc3dpdGgoIk1FVEEueW1sIikKKyAg ICAgICAgdGVzdF9zdWl0ZXMgPSBbXQorICAgICAgICBmb3IgbWV0YV9maWxlIGluIHNlbGYuX2Zp bGVzeXN0ZW0uZmlsZXNfdW5kZXIoZGlyLCBmaWxlX2ZpbHRlcj1pc19tZXRhX3ltbCk6CisgICAg ICAgICAgICB0ZXN0X3N1aXRlcy5hcHBlbmQobWV0YV9maWxlLnNwbGl0KGRpcilbMV0uc3BsaXQo Ik1FVEEueW1sIilbMF0uc3RyaXAoIi8iKSkKKyAgICAgICAgcmV0dXJuIHRlc3Rfc3VpdGVzCisK KyAgICBkZWYgX3NraXBfbm90X2ltcG9ydGVkX3N1aXRlcyhzZWxmLCBiYXNlX3N1aXRlX25hbWUs IGxheW91dF90ZXN0X2ltcG9ydGVkX2RpciwgdXBzdHJlYW1fZGlyKToKKyAgICAgICAgdXBzdHJl YW1fdGVzdF9zdWl0ZXMgPSBzZWxmLl9maW5kX3Rlc3Rfc3VpdGVzKHVwc3RyZWFtX2RpcikKKyAg ICAgICAgaW1wb3J0ZWRfdGVzdF9zdWl0ZXMgPSBzZWxmLl9maW5kX3Rlc3Rfc3VpdGVzKGxheW91 dF90ZXN0X2ltcG9ydGVkX2RpcikKKyAgICAgICAgbmV3X3N1aXRlc19zdGlsbF9ub3RfaW1wb3J0 ZWQgPSBsaXN0KHNldCh1cHN0cmVhbV90ZXN0X3N1aXRlcykgLSBzZXQoaW1wb3J0ZWRfdGVzdF9z dWl0ZXMpKQorICAgICAgICBzZWxmLnBhdGhzX3RvX3NraXAuZXh0ZW5kKFtzZWxmLl9maWxlc3lz dGVtLmpvaW4oYmFzZV9zdWl0ZV9uYW1lLCBzdWl0ZSkgZm9yIHN1aXRlIGluIG5ld19zdWl0ZXNf c3RpbGxfbm90X2ltcG9ydGVkXSkKKworICAgIGRlZiBfYWRkX2ltcG9ydGVkX3N1aXRlcyhzZWxm LCBiYXNlX3N1aXRlX25hbWUsIGxheW91dF90ZXN0X2ltcG9ydGVkX2Rpcik6CisgICAgICAgIGlt cG9ydGVkX3Rlc3Rfc3VpdGVzID0gc2VsZi5fZmluZF90ZXN0X3N1aXRlcyhsYXlvdXRfdGVzdF9p bXBvcnRlZF9kaXIpCisgICAgICAgIHNlbGYucGF0aHNfdG9faW1wb3J0LmV4dGVuZChbc2VsZi5f ZmlsZXN5c3RlbS5qb2luKGJhc2Vfc3VpdGVfbmFtZSwgc3VpdGUpIGZvciBzdWl0ZSBpbiBpbXBv cnRlZF90ZXN0X3N1aXRlc10pCisKKyAgICBkZWYgX3Vuc2tpcF9pbXBvcnRlZF9kaXJzKHNlbGYs IGJhc2Vfc3VpdGVfbmFtZSwgbGF5b3V0X3Rlc3RfaW1wb3J0ZWRfZGlyKToKKyAgICAgICAgc2tp cF9kaXJzX3RvX3JlbW92ZSA9IFtdCisgICAgICAgIGZvciBpbXBvcnRlZF9kaXIgaW4gc2VsZi5f ZmlsZXN5c3RlbS5maWxlc191bmRlcihsYXlvdXRfdGVzdF9pbXBvcnRlZF9kaXIpOgorICAgICAg ICAgICAgcmVsYXRpdmVfaW1wb3J0ZWRfZGlyID0gc2VsZi5fZmlsZXN5c3RlbS5qb2luKGJhc2Vf c3VpdGVfbmFtZSwgaW1wb3J0ZWRfZGlyLnNwbGl0KGJhc2Vfc3VpdGVfbmFtZSlbMV0uc3RyaXAo Ii8iKSkKKyAgICAgICAgICAgIGZvciBza2lwX2RpcmVjdG9yeSBpbiBzZWxmLnBhdGhzX3RvX3Nr aXA6CisgICAgICAgICAgICAgICAgaWYgcmVsYXRpdmVfaW1wb3J0ZWRfZGlyLnN0YXJ0c3dpdGgo c2tpcF9kaXJlY3RvcnkpOgorICAgICAgICAgICAgICAgICAgICBpZiBza2lwX2RpcmVjdG9yeSBu b3QgaW4gc2tpcF9kaXJzX3RvX3JlbW92ZToKKyAgICAgICAgICAgICAgICAgICAgICAgIHNraXBf ZGlyc190b19yZW1vdmUuYXBwZW5kKHNraXBfZGlyZWN0b3J5KQorICAgICAgICBmb3Igc2tpcF9w YXRoIGluIHNraXBfZGlyc190b19yZW1vdmU6CisgICAgICAgICAgICBfbG9nLndhcm5pbmcoIlVu c2tpcHBpbmcgcGF0aCAlcyBiZWNhdXNlIGl0cyBhbHJlYWR5IGltcG9ydGVkICgtLXVwZGF0ZS1p bXBvcnQpIiAlIHNraXBfcGF0aCkKKyAgICAgICAgICAgIHNlbGYucGF0aHNfdG9fc2tpcC5yZW1v dmUoc2tpcF9wYXRoKQorCiAgICAgZGVmIGNvcHlfdGVzdHMoc2VsZiwgZGVzdGluYXRpb25fZGly ZWN0b3J5LCB0ZXN0X3BhdGhzKToKICAgICAgICAgZm9yIHRlc3RfcmVwb3NpdG9yeSBpbiBzZWxm LnRlc3RfcmVwb3NpdG9yaWVzOgogICAgICAgICAgICAgc2VsZi5fZW1wdHlfZGlyZWN0b3J5KHNl bGYuX2ZpbGVzeXN0ZW0uam9pbihkZXN0aW5hdGlvbl9kaXJlY3RvcnksIHRlc3RfcmVwb3NpdG9y eVsnbmFtZSddKSkKQEAgLTEzMyw3ICsxNjQsMTMgQEAgY2xhc3MgVGVzdERvd25sb2FkZXIob2Jq ZWN0KToKICAgICAgICAgICAgICAgICBjb3B5X3BhdGhzLmFwcGVuZChwYXRoKQogICAgICAgICBl bHNlOgogICAgICAgICAgICAgZm9yIHRlc3RfcmVwb3NpdG9yeSBpbiBzZWxmLnRlc3RfcmVwb3Np dG9yaWVzOgotICAgICAgICAgICAgICAgIHNlbGYuX2FkZF90ZXN0X3N1aXRlX3BhdGhzKGNvcHlf cGF0aHMsIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLnJlcG9zaXRvcnlfZGlyZWN0b3J5LCB0 ZXN0X3JlcG9zaXRvcnlbJ25hbWUnXSksIHRlc3RfcmVwb3NpdG9yeVsnbmFtZSddKQorICAgICAg ICAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMudXBkYXRlX2ltcG9ydDoKKyAgICAgICAgICAgICAg ICAgICAgc2VsZi5fYWRkX3Rlc3Rfc3VpdGVfcGF0aHMoY29weV9wYXRocywgc2VsZi53ZWJraXRf ZmluZGVyLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgnTGF5b3V0VGVzdHMnLCAnaW1wb3J0ZWQnLCAn dzNjJywgdGVzdF9yZXBvc2l0b3J5WyduYW1lJ10pLCB0ZXN0X3JlcG9zaXRvcnlbJ25hbWUnXSkK KyAgICAgICAgICAgICAgICAgICAgc2VsZi5fc2tpcF9ub3RfaW1wb3J0ZWRfc3VpdGVzKHRlc3Rf cmVwb3NpdG9yeVsnbmFtZSddLCBzZWxmLndlYmtpdF9maW5kZXIucGF0aF9mcm9tX3dlYmtpdF9i YXNlKCdMYXlvdXRUZXN0cycsICdpbXBvcnRlZCcsICd3M2MnLCB0ZXN0X3JlcG9zaXRvcnlbJ25h bWUnXSksIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLnJlcG9zaXRvcnlfZGlyZWN0b3J5LCB0 ZXN0X3JlcG9zaXRvcnlbJ25hbWUnXSkpCisgICAgICAgICAgICAgICAgICAgIHNlbGYuX3Vuc2tp cF9pbXBvcnRlZF9kaXJzKHRlc3RfcmVwb3NpdG9yeVsnbmFtZSddLCBzZWxmLndlYmtpdF9maW5k ZXIucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCdMYXlvdXRUZXN0cycsICdpbXBvcnRlZCcsICd3M2Mn LCB0ZXN0X3JlcG9zaXRvcnlbJ25hbWUnXSkpCisgICAgICAgICAgICAgICAgICAgIHNlbGYuX2Fk ZF9pbXBvcnRlZF9zdWl0ZXModGVzdF9yZXBvc2l0b3J5WyduYW1lJ10sIHNlbGYud2Via2l0X2Zp bmRlci5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoJ0xheW91dFRlc3RzJywgJ2ltcG9ydGVkJywgJ3cz YycsIHRlc3RfcmVwb3NpdG9yeVsnbmFtZSddKSkKKyAgICAgICAgICAgICAgICBlbHNlOgorICAg ICAgICAgICAgICAgICAgICBzZWxmLl9hZGRfdGVzdF9zdWl0ZV9wYXRocyhjb3B5X3BhdGhzLCBz ZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5yZXBvc2l0b3J5X2RpcmVjdG9yeSwgdGVzdF9yZXBv c2l0b3J5WyduYW1lJ10pLCB0ZXN0X3JlcG9zaXRvcnlbJ25hbWUnXSkKICAgICAgICAgICAgICMg SGFuZGxpbmcgb2YgdGVzdHMgbWFya2VkIGFzIFsgUGFzcyBdIGluIGV4cGVjdGF0aW9ucyBmaWxl LgogICAgICAgICAgICAgZm9yIHBhdGggaW4gc2VsZi5wYXRoc190b19pbXBvcnQ6CiAgICAgICAg ICAgICAgICAgaWYgbm90IHBhdGggaW4gY29weV9wYXRoczoKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5CmluZGV4IDYyOGRjNjhjMTcxNTY3OTcxM2VlNjczODc0 NGIyYTQ1MDFjNmVlZTEuLjQwYWI5MjY4ODhlNmQzZmM5NzkxN2U2MjdjN2IzYTcyOGQ5ZmI1Yjkg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weQpAQCAtMTQ0 LDcgKzE0NCw4IEBAIFRvIGltcG9ydCBhIHdlYi1wbGF0Zm9ybS10ZXN0cyBzdWl0ZSBmcm9tIGEg c3BlY2lmaWMgZm9sZGVyLCB1c2UgJ2ltcG9ydC13M2MtdGVzCiAgICAgICAgICBoZWxwPSdEbyBu b3QgZmV0Y2ggdGhlIHJlcG9zaXRvcmllcy4gQnkgZGVmYXVsdCwgcmVwb3NpdG9yaWVzIGFyZSBm ZXRjaGVkIGlmIGEgc291cmNlIGRpcmVjdG9yeSBpcyBub3QgcHJvdmlkZWQnKQogICAgIHBhcnNl ci5hZGRfYXJndW1lbnQoJy0taW1wb3J0LWFsbCcsIGFjdGlvbj0nc3RvcmVfdHJ1ZScsIGRlZmF1 bHQ9RmFsc2UsCiAgICAgICAgICBoZWxwPSdJZ25vcmUgdGhlIGltcG9ydC1leHBlY3RhdGlvbnMu anNvbiBmaWxlLiBBbGwgdGVzdHMgd2lsbCBiZSBpbXBvcnRlZC4gVGhpcyBvcHRpb24gb25seSBh cHBsaWVzIHdoZW4gdGVzdHMgYXJlIGRvd25sb2FkZWQgZnJvbSBXM0MgcmVwb3NpdG9yeScpCi0K KyAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLXVwZGF0ZS1pbXBvcnQnLCBhY3Rpb249J3N0b3Jl X3RydWUnLCBkZWZhdWx0PUZhbHNlLAorICAgICAgICAgaGVscD0nT25seSB1cGRhdGUgZGlyZWN0 b3JpZXMgYWxyZWFkeSBpbXBvcnRlZCwgYnV0IG5vdCBpbXBvcnQgbmV3IGRpcmVjdG9yaWVzIHRo YXQgYmVsb25nIHRvIGEgZGlmZmVyZW50IHRlc3RzdWl0ZS4gVGhpcyBvcHRpb24gb25seSBhcHBs aWVzIHdoZW4gdGVzdHMgYXJlIGRvd25sb2FkZWQgZnJvbSBXM0MgcmVwb3NpdG9yeScpCiAgICAg cGFyc2VyLmFkZF9hcmd1bWVudCgnLS1jbGVhbi1kZXN0LWRpcicsIGFjdGlvbj0nc3RvcmVfdHJ1 ZScsIGRlc3Q9J2NsZWFuX2Rlc3RpbmF0aW9uX2RpcmVjdG9yeScsIGRlZmF1bHQ9RmFsc2UsCiAg ICAgICAgICBoZWxwPSdDbGVhbiBkZXN0aW5hdGlvbiBkaXJlY3RvcnkuIEFsbCBmaWxlcyBpbiB0 aGUgZGVzdGluYXRpb24gZGlyZWN0b3J5IHdpbGwgYmUgZGVsZXRlZCBleGNlcHQgZm9yIFdlYktp dCBzcGVjaWZpYyBmaWxlcyAodGVzdCBleHBlY3RhdGlvbnMsIC5naXRpZ25vcmUuLi4pIGJlZm9y ZSBuZXcgdGVzdHMgaW1wb3J0LiBEYW5nbGluZyB0ZXN0IGV4cGVjdGF0aW9ucyAoZXhwZWN0YXRp b24gZmlsZSB0aGF0IGlzIG5vIGxvbmdlciByZWxhdGVkIHRvIGEgdGVzdCkgYXJlIHJlbW92ZWQg YWZ0ZXIgdGVzdHMgaW1wb3J0LicpCiAKQEAgLTI0MSw2ICsyNDIsNyBAQCBjbGFzcyBUZXN0SW1w b3J0ZXIob2JqZWN0KToKICAgICAgICAgICAgIGRvd25sb2FkX29wdGlvbnMuZmV0Y2ggPSBzZWxm Lm9wdGlvbnMuZmV0Y2gKICAgICAgICAgICAgIGRvd25sb2FkX29wdGlvbnMudmVyYm9zZSA9IHNl bGYub3B0aW9ucy52ZXJib3NlCiAgICAgICAgICAgICBkb3dubG9hZF9vcHRpb25zLmltcG9ydF9h bGwgPSBzZWxmLm9wdGlvbnMuaW1wb3J0X2FsbAorICAgICAgICAgICAgZG93bmxvYWRfb3B0aW9u cy51cGRhdGVfaW1wb3J0ID0gc2VsZi5vcHRpb25zLnVwZGF0ZV9pbXBvcnQKICAgICAgICAgICAg IHNlbGYuX3Rlc3RfZG93bmxvYWRlciA9IFRlc3REb3dubG9hZGVyKHNlbGYudGVzdHNfZG93bmxv YWRfcGF0aCwgc2VsZi5ob3N0LCBkb3dubG9hZF9vcHRpb25zKQogICAgICAgICByZXR1cm4gc2Vs Zi5fdGVzdF9kb3dubG9hZGVyCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dzNjL3Rlc3RfaW1wb3J0ZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3cz Yy90ZXN0X2ltcG9ydGVyX3VuaXR0ZXN0LnB5CmluZGV4IGMwZmMzZDJiMmVkNDMyMzAzZDBhZTIx ZWJlMzU0OThiZGYwNDVlOTAuLjVhOGM2NjMzM2Y1YzY2NGM2YTRlZTdlMjk5OTY0ZTFlMDZlYWNi NjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXJf dW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRl cl91bml0dGVzdC5weQpAQCAtNDU4LDMgKzQ1OCw2OSBAQCBjbGFzcyBUZXN0SW1wb3J0ZXJUZXN0 KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShmcy5leGlzdHMo Jy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvdC90ZXN0 Mi5hbnkuaHRtbCcpKQogICAgICAgICBzZWxmLmFzc2VydFRydWUoZnMuZXhpc3RzKCcvbW9jay1j aGVja291dC9MYXlvdXRUZXN0cy93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3QvdGVzdDIuYW55Lndv cmtlci5odG1sJykpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShmcy5leGlzdHMoJy9tb2NrLWNo ZWNrb3V0L0xheW91dFRlc3RzL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvdC90ZXN0Mi5hbnkuc2Vy dmljZXdvcmtlci5odG1sJykpCisKKyAgICBkZWYgdGVzdF91cGRhdGVfaW1wb3J0KHNlbGYpOgor ICAgICAgICBGQUtFX0ZJTEVTID0geworICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L1dlYktp dEJ1aWxkL3czYy10ZXN0cy9zdHJlYW1zLWFwaS9yZWZlcmVuY2UtaW1wbGVtZW50YXRpb24vd2Vi LXBsYXRmb3JtLXRlc3RzL3Rlc3QuaHRtbCc6ICc8IWRvY3R5cGUgaHRtbD48c2NyaXB0IHNyYz0i L3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+PHNjcmlwdCBzcmM9Ii9yZXNvdXJj ZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMiPjwvc2NyaXB0PicsCisgICAgICAgICAgICAnL21vY2st Y2hlY2tvdXQvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3Jlc291cmNlcy9UZXN0UmVwb3NpdG9y aWVzJzogJycnCitbCisgICAgeworICAgICAgICAibmFtZSI6ICJ3ZWItcGxhdGZvcm0tdGVzdHMi LAorICAgICAgICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9teXJlcG8iLAorICAgICAgICAi cmV2aXNpb24iOiAiN2NjOTZkZCIsCisgICAgICAgICJwYXRoc190b19za2lwIjogW10sCisgICAg ICAgICJwYXRoc190b19pbXBvcnQiOiBbXSwKKyAgICAgICAgImltcG9ydF9vcHRpb25zIjogW10K KyAgICAgfQorXScnJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9p bXBvcnRlZC93M2MvcmVzb3VyY2VzL2ltcG9ydC1leHBlY3RhdGlvbnMuanNvbic6ICcnJworewor IndlYi1wbGF0Zm9ybS10ZXN0cy9jc3MiOiAic2tpcCIsCisid2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3MtZmxleGJveCI6ICJpbXBvcnQiCit9JycnLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNr b3V0L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1m bGV4Ym94L3Rlc3QxLmh0bWwnOiAnb2xkdGVzdDEnLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNr b3V0L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1m bGV4Ym94L3Rlc3QyLmh0bWwnOiAnb2xkdGVzdDInLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNr b3V0L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1m bGV4Ym94L01FVEEueW1sJzogJ29sZG1ldGEnLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0 L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlk L3Rlc3QxLmh0bWwnOiAnb2xkdGVzdDEnLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL3Rl c3QyLmh0bWwnOiAnb2xkdGVzdDInLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91 dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL01FVEEu eW1sJzogJ29sZG1ldGEnLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3Rz L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvc3ZnL3Rlc3QxLmh0bWwnOiAnb2xkdGVz dDEnLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvc3ZnL3Rlc3QyLmh0bWwnOiAnb2xkdGVzdDInLAorICAgICAg ICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvc3ZnL01FVEEueW1sJzogJ29sZG1ldGEnLAorCisgICAgICAgICAgICAnL21vY2st Y2hlY2tvdXQvV2ViS2l0QnVpbGQvdzNjLXRlc3RzL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LWZsZXhib3gvdGVzdDEuaHRtbCc6ICduZXd0ZXN0MScsCisgICAgICAgICAgICAnL21vY2stY2hl Y2tvdXQvV2ViS2l0QnVpbGQvdzNjLXRlc3RzL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZs ZXhib3gvdGVzdDIuaHRtbCc6ICduZXd0ZXN0MicsCisgICAgICAgICAgICAnL21vY2stY2hlY2tv dXQvV2ViS2l0QnVpbGQvdzNjLXRlc3RzL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhi b3gvcmVzb3VyY2VzL3Rlc3QuanMnOiAnbmV3dGVzdC5qcycsCisgICAgICAgICAgICAnL21vY2st Y2hlY2tvdXQvV2ViS2l0QnVpbGQvdzNjLXRlc3RzL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LWZsZXhib3gvTUVUQS55bWwnOiAnbmV3bWV0YScsCisgICAgICAgICAgICAnL21vY2stY2hlY2tv dXQvV2ViS2l0QnVpbGQvdzNjLXRlc3RzL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQv dGVzdDEuaHRtbCc6ICduZXd0ZXN0MScsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvV2Vi S2l0QnVpbGQvdzNjLXRlc3RzL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvdGVzdDIu aHRtbCc6ICduZXd0ZXN0MicsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvV2ViS2l0QnVp bGQvdzNjLXRlc3RzL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvcmVzb3VyY2VzL3Rl c3QuanMnOiAnbmV3dGVzdC5qcycsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvV2ViS2l0 QnVpbGQvdzNjLXRlc3RzL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvTUVUQS55bWwn OiAnbmV3bWV0YScsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvV2ViS2l0QnVpbGQvdzNj LXRlc3RzL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLW1hZ2ljL3Rlc3QxLmh0bWwnOiAnbmV3 dGVzdDEnLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L1dlYktpdEJ1aWxkL3czYy10ZXN0 cy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1tYWdpYy90ZXN0Mi5odG1sJzogJ25ld3Rlc3Qy JywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9XZWJLaXRCdWlsZC93M2MtdGVzdHMvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtbWFnaWMvcmVzb3VyY2VzL3Rlc3QuanMnOiAnbmV3dGVz dC5qcycsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvV2ViS2l0QnVpbGQvdzNjLXRlc3Rz L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLW1hZ2ljL01FVEEueW1sJzogJ25ld21ldGEnLAor ICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L1dlYktpdEJ1aWxkL3czYy10ZXN0cy93ZWItcGxh dGZvcm0tdGVzdHMvd2VibWlkaS90ZXN0MS5odG1sJzogJ25ld3Rlc3QxJywKKyAgICAgICAgICAg ICcvbW9jay1jaGVja291dC9XZWJLaXRCdWlsZC93M2MtdGVzdHMvd2ViLXBsYXRmb3JtLXRlc3Rz L3dlYm1pZGkvdGVzdDIuaHRtbCc6ICduZXd0ZXN0MicsCisgICAgICAgICAgICAnL21vY2stY2hl Y2tvdXQvV2ViS2l0QnVpbGQvdzNjLXRlc3RzL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJtaWRpL3Jl c291cmNlcy90ZXN0LmpzJzogJ25ld3Rlc3QuanMnLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNr b3V0L1dlYktpdEJ1aWxkL3czYy10ZXN0cy93ZWItcGxhdGZvcm0tdGVzdHMvd2VibWlkaS9NRVRB LnltbCc6ICduZXdtZXRhJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9XZWJLaXRCdWls ZC93M2MtdGVzdHMvd2ViLXBsYXRmb3JtLXRlc3RzL3N2Zy90ZXN0MS5odG1sJzogJ25ld3Rlc3Qx JywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9XZWJLaXRCdWlsZC93M2MtdGVzdHMvd2Vi LXBsYXRmb3JtLXRlc3RzL3N2Zy90ZXN0Mi5odG1sJzogJ25ld3Rlc3QyJywKKyAgICAgICAgICAg ICcvbW9jay1jaGVja291dC9XZWJLaXRCdWlsZC93M2MtdGVzdHMvd2ViLXBsYXRmb3JtLXRlc3Rz L3N2Zy9yZXNvdXJjZXMvdGVzdC5qcyc6ICduZXd0ZXN0LmpzJywKKyAgICAgICAgICAgICcvbW9j ay1jaGVja291dC9XZWJLaXRCdWlsZC93M2MtdGVzdHMvd2ViLXBsYXRmb3JtLXRlc3RzL3N2Zy9N RVRBLnltbCc6ICduZXdtZXRhJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9XZWJLaXRC dWlsZC93M2MtdGVzdHMvd2ViLXBsYXRmb3JtLXRlc3RzL3N2Zy9zdmctZnV0dXJlL3Rlc3QxLmh0 bWwnOiAnbmV3dGVzdDEnLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L1dlYktpdEJ1aWxk L3czYy10ZXN0cy93ZWItcGxhdGZvcm0tdGVzdHMvc3ZnL3N2Zy1mdXR1cmUvdGVzdDIuaHRtbCc6 ICduZXd0ZXN0MicsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvV2ViS2l0QnVpbGQvdzNj LXRlc3RzL3dlYi1wbGF0Zm9ybS10ZXN0cy9zdmcvc3ZnLWZ1dHVyZS9yZXNvdXJjZXMvdGVzdC5q cyc6ICduZXd0ZXN0LmpzJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9XZWJLaXRCdWls ZC93M2MtdGVzdHMvd2ViLXBsYXRmb3JtLXRlc3RzL3N2Zy9zdmctZnV0dXJlL01FVEEueW1sJzog J25ld21ldGEnCisgICAgICAgIH0KKworICAgICAgICBmcyA9IHNlbGYuaW1wb3J0X2Rvd25sb2Fk ZWRfdGVzdHMoWyctLW5vLWZldGNoJywgJy0tdXBkYXRlLWltcG9ydCddLCBGQUtFX0ZJTEVTKQor CisgICAgICAgIGZvciByZXNvdXJjZV9maWxlIGluIFsndGVzdDEuaHRtbCcsICd0ZXN0Mi5odG1s JywgICdNRVRBLnltbCcsICdyZXNvdXJjZXMvdGVzdC5qcyddOgorICAgICAgICAgICAgZm9yIGV4 cGVjdGVkX3VwZGF0ZWRfc3VpdGUgaW4gWydjc3MvY3NzLWZsZXhib3gnLCAnY3NzL2Nzcy1ncmlk JywgJ3N2ZyddOgorICAgICAgICAgICAgICAgIGZ1bGxfcGF0aF9leHBlY3RlZF9pbXBvcnRfZmls ZSA9IG9zLnBhdGguam9pbignL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cycsIGV4cGVjdGVkX3VwZGF0ZWRfc3VpdGUsIHJlc291cmNlX2Zp bGUpCisgICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGZzLmV4aXN0cyhmdWxsX3BhdGhf ZXhwZWN0ZWRfaW1wb3J0X2ZpbGUpKQorICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShm cy5yZWFkX3RleHRfZmlsZShmdWxsX3BhdGhfZXhwZWN0ZWRfaW1wb3J0X2ZpbGUpLnN0YXJ0c3dp dGgoIm5ldyIpKQorICAgICAgICAgICAgZm9yIGV4cGVjdGVkX2lnbm9yZWRfc3VpdGUgaW4gWydj c3MvY3NzLW1hZ2ljJywgJ3dlYm1pZGknLCAnc3ZnL3N2Zy1mdXR1cmUnXToKKyAgICAgICAgICAg ICAgICBmdWxsX3BhdGhfZXhwZWN0ZWRfaWdub3JlX2ZpbGUgPSBvcy5wYXRoLmpvaW4oJy9tb2Nr LWNoZWNrb3V0L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMnLCBl eHBlY3RlZF9pZ25vcmVkX3N1aXRlLCByZXNvdXJjZV9maWxlKQorICAgICAgICAgICAgICAgIHNl bGYuYXNzZXJ0RmFsc2UoZnMuZXhpc3RzKGZ1bGxfcGF0aF9leHBlY3RlZF9pZ25vcmVfZmlsZSkp Cg== 403656 2020-07-06 19:50:43 -0700 2020-07-06 19:50:43 -0700 Patch bug-214006-20200707045042.patch text/plain 15643 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0MDA1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjE3ODlkMjI0NGRjYTg5NGY5ZjIwZWI0OTFjN2NjMWY3 NzUyMzAyMy4uZTMyYjVhM2MwMmRmZWRiNjAyYjg0ODYzYmFhZDMzNDdlOGE4M2ViZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3 IEBACisyMDIwLTA3LTA2ICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFczQyB0ZXN0IGltcG9ydGVyIHNob3VsZCBiZSBhYmxlIHRvIHVw ZGF0ZSBqdXN0IHRoZSBpbXBvcnRlZCB0ZXN0cyAod2l0aG91dCBhZGRpbmcgbmV3IGRpcmVjdG9y aWVzIGZvciBkaWZmZXJlbnQgdGVzdCBzcGVjcy4pCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQwMDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGFkZHMgYSBuZXcgLS11cGRhdGUtaW1wb3J0IHN3 aXRjaCBmb3IgdGhlIHNjcmlwdCBpbXBvcnQtdzNjLXRlc3RzLgorCisgICAgICAgIEluIHRoaXMg bW9kZSwgdGhlIHNjcmlwdCBidWlsZHMgYSBsaXN0IG9mIGFscmVhZHkgaW1wb3J0ZWQgc3VpdGVz IGJ5IGNoZWNraW5nIHdoaWNoIGRpcmVjdG9yaWVzIGNvbnRhaW4gYSBmaWxlCisgICAgICAgIG5h bWVkIE1FVEEueW1sICh3aGljaCBpdHMgdGhlIGRlLWZhY3RvIHdheSBvbiBXUFQgZm9yIGRlY2xh cmluZyB0aGF0IGEgZm9sZGVyIGNvbnRhaW5zIHRlc3RzIGZvciBhIHNwZWMpLgorCisgICAgICAg IFRoZW4gaXQgd2lsbCBhZGQgdG8gdGhlIGxpc3Qgb2YgZGlyZWN0b3JpZXMgdG8gaW1wb3J0IGFs bCB0aGUgZGlyZWN0b3JpZXMgYmVsb25naW5nIHRvIGRldGVjdGVkIGltcG9ydGVkIHRlc3Qgc3Vp dGVzICh1bnNraXBwaW5nIHRoZW0gaWYgbmVlZGVkKS4KKyAgICAgICAgSXQgd2lsbCBhbHNvIGFk ZCBhbGwgdGhlIGN1cnJlbnQgaW1wb3J0ZWQgZGlyZWN0b3JpZXMuIEZpbmFsbHkgaXQgd2lsbCBz a2lwIGFsbCB0aGUgdGVzdCBzdWl0ZXMgZGV0ZWN0ZWQgaW4gdGhlIHVwc3RyZWFtIFdQVCBjaGVj a291dCB0aGF0IGFyZSBzdGlsbCBub3QgaW1wb3J0ZWQuCisKKyAgICAgICAgVGhhdCB3YXkgaXQg YmVjb21lcyBwb3NzaWJsZSB0byB1cGRhdGUgYW4gV1BUIGRpcmVjdG9yeSBsaWtlIGNzcy8gdGhh dCBjb250YWlucyBzZXZlcmFsIHN1YiB0ZXN0LXN1aXRlcywgYW5kIG9ubHkgdXBkYXRlIHRoZSBk aXJlY3RvcmllcyBmb3IgdGhlIHN1aXRlcyBhbHJlYWR5IGltcG9ydGVkLgorICAgICAgICBJdCBh bHNvIGJlY29tZXMgcG9zc2libGUgdG8gdXBkYXRlIHRoZSBnZW5lcmFsIFdQVCBjaGVja291dCB3 aXRob3V0IGFkZGluZyBuZXcgdGVzdCBzdWl0ZXMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L3czYy90ZXN0X2Rvd25sb2FkZXIucHk6CisgICAgICAgIChUZXN0RG93bmxvYWRlci5kZWZh dWx0X29wdGlvbnMpOgorICAgICAgICAoVGVzdERvd25sb2FkZXIuX19pbml0X18pOgorICAgICAg ICAoVGVzdERvd25sb2FkZXIuX2ZpbmRfdGVzdF9zdWl0ZXMpOgorICAgICAgICAoVGVzdERvd25s b2FkZXIuX2ZpbmRfdGVzdF9zdWl0ZXMuaXNfbWV0YV95bWwpOgorICAgICAgICAoVGVzdERvd25s b2FkZXIpOgorICAgICAgICAoVGVzdERvd25sb2FkZXIuX3NraXBfbm90X2ltcG9ydGVkX3N1aXRl cyk6CisgICAgICAgIChUZXN0RG93bmxvYWRlci5fYWRkX2ltcG9ydGVkX3N1aXRlcyk6CisgICAg ICAgIChUZXN0RG93bmxvYWRlci5fdW5za2lwX2ltcG9ydGVkX2RpcnMpOgorICAgICAgICAoVGVz dERvd25sb2FkZXIuY29weV90ZXN0cyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS93M2Mv dGVzdF9pbXBvcnRlci5weToKKyAgICAgICAgKFRlc3RJbXBvcnRlci50ZXN0X2Rvd25sb2FkZXIp OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXJfdW5pdHRlc3Qu cHk6CisgICAgICAgICh0ZXN0X3RlbXBsYXRlX3Rlc3QpOgorICAgICAgICAodGVzdF91cGRhdGVf aW1wb3J0KToKKwogMjAyMC0wNy0wNiAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxl LmNvbT4KIAogICAgICAgICBXZWIgcHJvY2VzcyBzb21ldGltZXMgY3Jhc2hlcyB3aGVuIHRyYW5z bGF0aW5nIGFuIGFydGljbGUgb24gc3BpZWdlbC5kZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS93M2MvdGVzdF9kb3dubG9hZGVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS93M2MvdGVzdF9kb3dubG9hZGVyLnB5CmluZGV4IDQzYmUzMmZhZjAxNTIxY2VmODY3ZjRhNDI2 OGE2OWQ1ZDNmZDE0NzUuLmY1ZWMyZjg4NGFmY2M2Mzg1ZjIwODY0ZjdiY2UyZjZjNzA4ZTJkNjcg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfZG93bmxvYWRlci5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2Rvd25sb2FkZXIucHkKQEAg LTQ1LDYgKzQ1LDcgQEAgY2xhc3MgVGVzdERvd25sb2FkZXIob2JqZWN0KToKICAgICAgICAgb3B0 aW9ucy5mZXRjaCA9IFRydWUKICAgICAgICAgb3B0aW9ucy52ZXJib3NlID0gRmFsc2UKICAgICAg ICAgb3B0aW9ucy5pbXBvcnRfYWxsID0gRmFsc2UKKyAgICAgICAgb3B0aW9ucy51cGRhdGVfaW1w b3J0ID0gRmFsc2UKICAgICAgICAgcmV0dXJuIG9wdGlvbnMKIAogICAgIEBzdGF0aWNtZXRob2QK QEAgLTY5LDggKzcwLDggQEAgY2xhc3MgVGVzdERvd25sb2FkZXIob2JqZWN0KToKICAgICAgICAg ICAgIHNlbGYucGF0aHNfdG9fc2tpcC5leHRlbmQoW3NlbGYuX2ZpbGVzeXN0ZW0uam9pbih0ZXN0 X3JlcG9zaXRvcnlbJ25hbWUnXSwgcGF0aCkgZm9yIHBhdGggaW4gdGVzdF9yZXBvc2l0b3J5Wydw YXRoc190b19za2lwJ11dKQogICAgICAgICAgICAgc2VsZi5wYXRoc190b19pbXBvcnQuZXh0ZW5k KFtzZWxmLl9maWxlc3lzdGVtLmpvaW4odGVzdF9yZXBvc2l0b3J5WyduYW1lJ10sIHBhdGgpIGZv ciBwYXRoIGluIHRlc3RfcmVwb3NpdG9yeVsncGF0aHNfdG9faW1wb3J0J11dKQogCi0gICAgICAg IHdlYmtpdF9maW5kZXIgPSBXZWJLaXRGaW5kZXIoc2VsZi5fZmlsZXN5c3RlbSkKLSAgICAgICAg c2VsZi5pbXBvcnRfZXhwZWN0YXRpb25zX3BhdGggPSB3ZWJraXRfZmluZGVyLnBhdGhfZnJvbV93 ZWJraXRfYmFzZSgnTGF5b3V0VGVzdHMnLCAnaW1wb3J0ZWQnLCAndzNjJywgJ3Jlc291cmNlcycs ICdpbXBvcnQtZXhwZWN0YXRpb25zLmpzb24nKQorICAgICAgICBzZWxmLndlYmtpdF9maW5kZXIg PSBXZWJLaXRGaW5kZXIoc2VsZi5fZmlsZXN5c3RlbSkKKyAgICAgICAgc2VsZi5pbXBvcnRfZXhw ZWN0YXRpb25zX3BhdGggPSBzZWxmLndlYmtpdF9maW5kZXIucGF0aF9mcm9tX3dlYmtpdF9iYXNl KCdMYXlvdXRUZXN0cycsICdpbXBvcnRlZCcsICd3M2MnLCAncmVzb3VyY2VzJywgJ2ltcG9ydC1l eHBlY3RhdGlvbnMuanNvbicpCiAgICAgICAgIGlmIG5vdCBzZWxmLl9maWxlc3lzdGVtLmlzZmls ZShzZWxmLmltcG9ydF9leHBlY3RhdGlvbnNfcGF0aCk6CiAgICAgICAgICAgICBfbG9nLndhcm5p bmcoJ1VuYWJsZSB0byByZWFkIGltcG9ydCBleHBlY3RhdGlvbiBmaWxlOiAlcycgJSBzZWxmLmlt cG9ydF9leHBlY3RhdGlvbnNfcGF0aCkKICAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMuaW1w b3J0X2FsbDoKQEAgLTEyMSw2ICsxMjIsMzYgQEAgY2xhc3MgVGVzdERvd25sb2FkZXIob2JqZWN0 KToKICAgICAgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0ucm10cmVlKGRpcmVjdG9yeSkKICAgICAg ICAgc2VsZi5fZmlsZXN5c3RlbS5tYXliZV9tYWtlX2RpcmVjdG9yeShkaXJlY3RvcnkpCiAKKyAg ICBkZWYgX2ZpbmRfdGVzdF9zdWl0ZXMoc2VsZiwgZGlyKToKKyAgICAgICAgZGVmIGlzX21ldGFf eW1sKGZpbGVzeXN0ZW0sIGRpcm5hbWUsIGZpbGVuYW1lKToKKyAgICAgICAgICAgIHJldHVybiBm aWxlbmFtZS5lbmRzd2l0aCgiTUVUQS55bWwiKQorICAgICAgICB0ZXN0X3N1aXRlcyA9IFtdCisg ICAgICAgIGZvciBtZXRhX2ZpbGUgaW4gc2VsZi5fZmlsZXN5c3RlbS5maWxlc191bmRlcihkaXIs IGZpbGVfZmlsdGVyPWlzX21ldGFfeW1sKToKKyAgICAgICAgICAgIHRlc3Rfc3VpdGVzLmFwcGVu ZChtZXRhX2ZpbGUuc3BsaXQoZGlyKVsxXS5zcGxpdCgiTUVUQS55bWwiKVswXS5zdHJpcCgiLyIp KQorICAgICAgICByZXR1cm4gdGVzdF9zdWl0ZXMKKworICAgIGRlZiBfc2tpcF9ub3RfaW1wb3J0 ZWRfc3VpdGVzKHNlbGYsIGJhc2Vfc3VpdGVfbmFtZSwgbGF5b3V0X3Rlc3RfaW1wb3J0ZWRfZGly LCB1cHN0cmVhbV9kaXIpOgorICAgICAgICB1cHN0cmVhbV90ZXN0X3N1aXRlcyA9IHNlbGYuX2Zp bmRfdGVzdF9zdWl0ZXModXBzdHJlYW1fZGlyKQorICAgICAgICBpbXBvcnRlZF90ZXN0X3N1aXRl cyA9IHNlbGYuX2ZpbmRfdGVzdF9zdWl0ZXMobGF5b3V0X3Rlc3RfaW1wb3J0ZWRfZGlyKQorICAg ICAgICBuZXdfc3VpdGVzX3N0aWxsX25vdF9pbXBvcnRlZCA9IGxpc3Qoc2V0KHVwc3RyZWFtX3Rl c3Rfc3VpdGVzKSAtIHNldChpbXBvcnRlZF90ZXN0X3N1aXRlcykpCisgICAgICAgIHNlbGYucGF0 aHNfdG9fc2tpcC5leHRlbmQoW3NlbGYuX2ZpbGVzeXN0ZW0uam9pbihiYXNlX3N1aXRlX25hbWUs IHN1aXRlKSBmb3Igc3VpdGUgaW4gbmV3X3N1aXRlc19zdGlsbF9ub3RfaW1wb3J0ZWRdKQorCisg ICAgZGVmIF9hZGRfaW1wb3J0ZWRfc3VpdGVzKHNlbGYsIGJhc2Vfc3VpdGVfbmFtZSwgbGF5b3V0 X3Rlc3RfaW1wb3J0ZWRfZGlyKToKKyAgICAgICAgaW1wb3J0ZWRfdGVzdF9zdWl0ZXMgPSBzZWxm Ll9maW5kX3Rlc3Rfc3VpdGVzKGxheW91dF90ZXN0X2ltcG9ydGVkX2RpcikKKyAgICAgICAgc2Vs Zi5wYXRoc190b19pbXBvcnQuZXh0ZW5kKFtzZWxmLl9maWxlc3lzdGVtLmpvaW4oYmFzZV9zdWl0 ZV9uYW1lLCBzdWl0ZSkgZm9yIHN1aXRlIGluIGltcG9ydGVkX3Rlc3Rfc3VpdGVzXSkKKworICAg IGRlZiBfdW5za2lwX2ltcG9ydGVkX2RpcnMoc2VsZiwgYmFzZV9zdWl0ZV9uYW1lLCBsYXlvdXRf dGVzdF9pbXBvcnRlZF9kaXIpOgorICAgICAgICBza2lwX2RpcnNfdG9fcmVtb3ZlID0gW10KKyAg ICAgICAgZm9yIGltcG9ydGVkX2RpciBpbiBzZWxmLl9maWxlc3lzdGVtLmZpbGVzX3VuZGVyKGxh eW91dF90ZXN0X2ltcG9ydGVkX2Rpcik6CisgICAgICAgICAgICByZWxhdGl2ZV9pbXBvcnRlZF9k aXIgPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oYmFzZV9zdWl0ZV9uYW1lLCBpbXBvcnRlZF9kaXIu c3BsaXQoYmFzZV9zdWl0ZV9uYW1lKVsxXS5zdHJpcCgiLyIpKQorICAgICAgICAgICAgZm9yIHNr aXBfZGlyZWN0b3J5IGluIHNlbGYucGF0aHNfdG9fc2tpcDoKKyAgICAgICAgICAgICAgICBpZiBy ZWxhdGl2ZV9pbXBvcnRlZF9kaXIgPT0gc2tpcF9kaXJlY3Rvcnkgb3IgcmVsYXRpdmVfaW1wb3J0 ZWRfZGlyLnN0YXJ0c3dpdGgoc2tpcF9kaXJlY3RvcnkgKyAiLyIpOgorICAgICAgICAgICAgICAg ICAgICBpZiBza2lwX2RpcmVjdG9yeSBub3QgaW4gc2tpcF9kaXJzX3RvX3JlbW92ZToKKyAgICAg ICAgICAgICAgICAgICAgICAgIHNraXBfZGlyc190b19yZW1vdmUuYXBwZW5kKHNraXBfZGlyZWN0 b3J5KQorICAgICAgICBmb3Igc2tpcF9wYXRoIGluIHNraXBfZGlyc190b19yZW1vdmU6CisgICAg ICAgICAgICBfbG9nLndhcm5pbmcoIlVuc2tpcHBpbmcgcGF0aCAlcyBiZWNhdXNlIGl0cyBhbHJl YWR5IGltcG9ydGVkICgtLXVwZGF0ZS1pbXBvcnQpIiAlIHNraXBfcGF0aCkKKyAgICAgICAgICAg IHNlbGYucGF0aHNfdG9fc2tpcC5yZW1vdmUoc2tpcF9wYXRoKQorCiAgICAgZGVmIGNvcHlfdGVz dHMoc2VsZiwgZGVzdGluYXRpb25fZGlyZWN0b3J5LCB0ZXN0X3BhdGhzKToKICAgICAgICAgZm9y IHRlc3RfcmVwb3NpdG9yeSBpbiBzZWxmLnRlc3RfcmVwb3NpdG9yaWVzOgogICAgICAgICAgICAg c2VsZi5fZW1wdHlfZGlyZWN0b3J5KHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihkZXN0aW5hdGlvbl9k aXJlY3RvcnksIHRlc3RfcmVwb3NpdG9yeVsnbmFtZSddKSkKQEAgLTEzMyw3ICsxNjQsMTMgQEAg Y2xhc3MgVGVzdERvd25sb2FkZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICBjb3B5X3BhdGhz LmFwcGVuZChwYXRoKQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgZm9yIHRlc3RfcmVwb3Np dG9yeSBpbiBzZWxmLnRlc3RfcmVwb3NpdG9yaWVzOgotICAgICAgICAgICAgICAgIHNlbGYuX2Fk ZF90ZXN0X3N1aXRlX3BhdGhzKGNvcHlfcGF0aHMsIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxm LnJlcG9zaXRvcnlfZGlyZWN0b3J5LCB0ZXN0X3JlcG9zaXRvcnlbJ25hbWUnXSksIHRlc3RfcmVw b3NpdG9yeVsnbmFtZSddKQorICAgICAgICAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMudXBkYXRl X2ltcG9ydDoKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5fYWRkX3Rlc3Rfc3VpdGVfcGF0aHMo Y29weV9wYXRocywgc2VsZi53ZWJraXRfZmluZGVyLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgnTGF5 b3V0VGVzdHMnLCAnaW1wb3J0ZWQnLCAndzNjJywgdGVzdF9yZXBvc2l0b3J5WyduYW1lJ10pLCB0 ZXN0X3JlcG9zaXRvcnlbJ25hbWUnXSkKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5fc2tpcF9u b3RfaW1wb3J0ZWRfc3VpdGVzKHRlc3RfcmVwb3NpdG9yeVsnbmFtZSddLCBzZWxmLndlYmtpdF9m aW5kZXIucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCdMYXlvdXRUZXN0cycsICdpbXBvcnRlZCcsICd3 M2MnLCB0ZXN0X3JlcG9zaXRvcnlbJ25hbWUnXSksIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxm LnJlcG9zaXRvcnlfZGlyZWN0b3J5LCB0ZXN0X3JlcG9zaXRvcnlbJ25hbWUnXSkpCisgICAgICAg ICAgICAgICAgICAgIHNlbGYuX3Vuc2tpcF9pbXBvcnRlZF9kaXJzKHRlc3RfcmVwb3NpdG9yeVsn bmFtZSddLCBzZWxmLndlYmtpdF9maW5kZXIucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCdMYXlvdXRU ZXN0cycsICdpbXBvcnRlZCcsICd3M2MnLCB0ZXN0X3JlcG9zaXRvcnlbJ25hbWUnXSkpCisgICAg ICAgICAgICAgICAgICAgIHNlbGYuX2FkZF9pbXBvcnRlZF9zdWl0ZXModGVzdF9yZXBvc2l0b3J5 WyduYW1lJ10sIHNlbGYud2Via2l0X2ZpbmRlci5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoJ0xheW91 dFRlc3RzJywgJ2ltcG9ydGVkJywgJ3czYycsIHRlc3RfcmVwb3NpdG9yeVsnbmFtZSddKSkKKyAg ICAgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgICAgICBzZWxmLl9hZGRfdGVzdF9z dWl0ZV9wYXRocyhjb3B5X3BhdGhzLCBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5yZXBvc2l0 b3J5X2RpcmVjdG9yeSwgdGVzdF9yZXBvc2l0b3J5WyduYW1lJ10pLCB0ZXN0X3JlcG9zaXRvcnlb J25hbWUnXSkKICAgICAgICAgICAgICMgSGFuZGxpbmcgb2YgdGVzdHMgbWFya2VkIGFzIFsgUGFz cyBdIGluIGV4cGVjdGF0aW9ucyBmaWxlLgogICAgICAgICAgICAgZm9yIHBhdGggaW4gc2VsZi5w YXRoc190b19pbXBvcnQ6CiAgICAgICAgICAgICAgICAgaWYgbm90IHBhdGggaW4gY29weV9wYXRo czoKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5CmluZGV4IDYy OGRjNjhjMTcxNTY3OTcxM2VlNjczODc0NGIyYTQ1MDFjNmVlZTEuLjQwYWI5MjY4ODhlNmQzZmM5 NzkxN2U2MjdjN2IzYTcyOGQ5ZmI1YjkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2Mv dGVzdF9pbXBvcnRlci5weQpAQCAtMTQ0LDcgKzE0NCw4IEBAIFRvIGltcG9ydCBhIHdlYi1wbGF0 Zm9ybS10ZXN0cyBzdWl0ZSBmcm9tIGEgc3BlY2lmaWMgZm9sZGVyLCB1c2UgJ2ltcG9ydC13M2Mt dGVzCiAgICAgICAgICBoZWxwPSdEbyBub3QgZmV0Y2ggdGhlIHJlcG9zaXRvcmllcy4gQnkgZGVm YXVsdCwgcmVwb3NpdG9yaWVzIGFyZSBmZXRjaGVkIGlmIGEgc291cmNlIGRpcmVjdG9yeSBpcyBu b3QgcHJvdmlkZWQnKQogICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy0taW1wb3J0LWFsbCcsIGFj dGlvbj0nc3RvcmVfdHJ1ZScsIGRlZmF1bHQ9RmFsc2UsCiAgICAgICAgICBoZWxwPSdJZ25vcmUg dGhlIGltcG9ydC1leHBlY3RhdGlvbnMuanNvbiBmaWxlLiBBbGwgdGVzdHMgd2lsbCBiZSBpbXBv cnRlZC4gVGhpcyBvcHRpb24gb25seSBhcHBsaWVzIHdoZW4gdGVzdHMgYXJlIGRvd25sb2FkZWQg ZnJvbSBXM0MgcmVwb3NpdG9yeScpCi0KKyAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLXVwZGF0 ZS1pbXBvcnQnLCBhY3Rpb249J3N0b3JlX3RydWUnLCBkZWZhdWx0PUZhbHNlLAorICAgICAgICAg aGVscD0nT25seSB1cGRhdGUgZGlyZWN0b3JpZXMgYWxyZWFkeSBpbXBvcnRlZCwgYnV0IG5vdCBp bXBvcnQgbmV3IGRpcmVjdG9yaWVzIHRoYXQgYmVsb25nIHRvIGEgZGlmZmVyZW50IHRlc3RzdWl0 ZS4gVGhpcyBvcHRpb24gb25seSBhcHBsaWVzIHdoZW4gdGVzdHMgYXJlIGRvd25sb2FkZWQgZnJv bSBXM0MgcmVwb3NpdG9yeScpCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1jbGVhbi1kZXN0 LWRpcicsIGFjdGlvbj0nc3RvcmVfdHJ1ZScsIGRlc3Q9J2NsZWFuX2Rlc3RpbmF0aW9uX2RpcmVj dG9yeScsIGRlZmF1bHQ9RmFsc2UsCiAgICAgICAgICBoZWxwPSdDbGVhbiBkZXN0aW5hdGlvbiBk aXJlY3RvcnkuIEFsbCBmaWxlcyBpbiB0aGUgZGVzdGluYXRpb24gZGlyZWN0b3J5IHdpbGwgYmUg ZGVsZXRlZCBleGNlcHQgZm9yIFdlYktpdCBzcGVjaWZpYyBmaWxlcyAodGVzdCBleHBlY3RhdGlv bnMsIC5naXRpZ25vcmUuLi4pIGJlZm9yZSBuZXcgdGVzdHMgaW1wb3J0LiBEYW5nbGluZyB0ZXN0 IGV4cGVjdGF0aW9ucyAoZXhwZWN0YXRpb24gZmlsZSB0aGF0IGlzIG5vIGxvbmdlciByZWxhdGVk IHRvIGEgdGVzdCkgYXJlIHJlbW92ZWQgYWZ0ZXIgdGVzdHMgaW1wb3J0LicpCiAKQEAgLTI0MSw2 ICsyNDIsNyBAQCBjbGFzcyBUZXN0SW1wb3J0ZXIob2JqZWN0KToKICAgICAgICAgICAgIGRvd25s b2FkX29wdGlvbnMuZmV0Y2ggPSBzZWxmLm9wdGlvbnMuZmV0Y2gKICAgICAgICAgICAgIGRvd25s b2FkX29wdGlvbnMudmVyYm9zZSA9IHNlbGYub3B0aW9ucy52ZXJib3NlCiAgICAgICAgICAgICBk b3dubG9hZF9vcHRpb25zLmltcG9ydF9hbGwgPSBzZWxmLm9wdGlvbnMuaW1wb3J0X2FsbAorICAg ICAgICAgICAgZG93bmxvYWRfb3B0aW9ucy51cGRhdGVfaW1wb3J0ID0gc2VsZi5vcHRpb25zLnVw ZGF0ZV9pbXBvcnQKICAgICAgICAgICAgIHNlbGYuX3Rlc3RfZG93bmxvYWRlciA9IFRlc3REb3du bG9hZGVyKHNlbGYudGVzdHNfZG93bmxvYWRfcGF0aCwgc2VsZi5ob3N0LCBkb3dubG9hZF9vcHRp b25zKQogICAgICAgICByZXR1cm4gc2VsZi5fdGVzdF9kb3dubG9hZGVyCiAKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXJfdW5pdHRlc3QucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyX3VuaXR0ZXN0LnB5CmluZGV4 IGMwZmMzZDJiMmVkNDMyMzAzZDBhZTIxZWJlMzU0OThiZGYwNDVlOTAuLjVhOGM2NjMzM2Y1YzY2 NGM2YTRlZTdlMjk5OTY0ZTFlMDZlYWNiNjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXJfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlcl91bml0dGVzdC5weQpAQCAtNDU4LDMgKzQ1OCw2OSBA QCBjbGFzcyBUZXN0SW1wb3J0ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2Vs Zi5hc3NlcnRGYWxzZShmcy5leGlzdHMoJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvdC90ZXN0Mi5hbnkuaHRtbCcpKQogICAgICAgICBzZWxmLmFzc2Vy dFRydWUoZnMuZXhpc3RzKCcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL3QvdGVzdDIuYW55Lndvcmtlci5odG1sJykpCiAgICAgICAgIHNlbGYuYXNzZXJ0 VHJ1ZShmcy5leGlzdHMoJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvdC90ZXN0Mi5hbnkuc2VydmljZXdvcmtlci5odG1sJykpCisKKyAgICBkZWYgdGVz dF91cGRhdGVfaW1wb3J0KHNlbGYpOgorICAgICAgICBGQUtFX0ZJTEVTID0geworICAgICAgICAg ICAgJy9tb2NrLWNoZWNrb3V0L1dlYktpdEJ1aWxkL3czYy10ZXN0cy9zdHJlYW1zLWFwaS9yZWZl cmVuY2UtaW1wbGVtZW50YXRpb24vd2ViLXBsYXRmb3JtLXRlc3RzL3Rlc3QuaHRtbCc6ICc8IWRv Y3R5cGUgaHRtbD48c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3Jp cHQ+PHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMiPjwvc2NyaXB0 PicsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L3Jlc291cmNlcy9UZXN0UmVwb3NpdG9yaWVzJzogJycnCitbCisgICAgeworICAgICAgICAibmFt ZSI6ICJ3ZWItcGxhdGZvcm0tdGVzdHMiLAorICAgICAgICAidXJsIjogImh0dHBzOi8vZ2l0aHVi LmNvbS9teXJlcG8iLAorICAgICAgICAicmV2aXNpb24iOiAiN2NjOTZkZCIsCisgICAgICAgICJw YXRoc190b19za2lwIjogW10sCisgICAgICAgICJwYXRoc190b19pbXBvcnQiOiBbXSwKKyAgICAg ICAgImltcG9ydF9vcHRpb25zIjogW10KKyAgICAgfQorXScnJywKKyAgICAgICAgICAgICcvbW9j ay1jaGVja291dC9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvcmVzb3VyY2VzL2ltcG9ydC1leHBl Y3RhdGlvbnMuanNvbic6ICcnJworeworIndlYi1wbGF0Zm9ybS10ZXN0cy9jc3MiOiAic2tpcCIs Cisid2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveCI6ICJpbXBvcnQiCit9JycnLAor ICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L3Rlc3QxLmh0bWwnOiAnb2xkdGVzdDEnLAor ICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L3Rlc3QyLmh0bWwnOiAnb2xkdGVzdDInLAor ICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L01FVEEueW1sJzogJ29sZG1ldGEnLAorICAg ICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL3Rlc3QxLmh0bWwnOiAnb2xkdGVzdDEnLAorICAgICAg ICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1ncmlkL3Rlc3QyLmh0bWwnOiAnb2xkdGVzdDInLAorICAgICAgICAg ICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1ncmlkL01FVEEueW1sJzogJ29sZG1ldGEnLAorICAgICAgICAgICAgJy9t b2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv c3ZnL3Rlc3QxLmh0bWwnOiAnb2xkdGVzdDEnLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0 L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvc3ZnL3Rlc3QyLmh0 bWwnOiAnb2xkdGVzdDInLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3Rz L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvc3ZnL01FVEEueW1sJzogJ29sZG1ldGEn LAorCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvV2ViS2l0QnVpbGQvdzNjLXRlc3RzL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvdGVzdDEuaHRtbCc6ICduZXd0ZXN0MScs CisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvV2ViS2l0QnVpbGQvdzNjLXRlc3RzL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvdGVzdDIuaHRtbCc6ICduZXd0ZXN0MicsCisg ICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvV2ViS2l0QnVpbGQvdzNjLXRlc3RzL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvcmVzb3VyY2VzL3Rlc3QuanMnOiAnbmV3dGVzdC5q cycsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvV2ViS2l0QnVpbGQvdzNjLXRlc3RzL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvTUVUQS55bWwnOiAnbmV3bWV0YScsCisg ICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvV2ViS2l0QnVpbGQvdzNjLXRlc3RzL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvdGVzdDEuaHRtbCc6ICduZXd0ZXN0MScsCisgICAgICAg ICAgICAnL21vY2stY2hlY2tvdXQvV2ViS2l0QnVpbGQvdzNjLXRlc3RzL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLWdyaWQvdGVzdDIuaHRtbCc6ICduZXd0ZXN0MicsCisgICAgICAgICAgICAn L21vY2stY2hlY2tvdXQvV2ViS2l0QnVpbGQvdzNjLXRlc3RzL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLWdyaWQvcmVzb3VyY2VzL3Rlc3QuanMnOiAnbmV3dGVzdC5qcycsCisgICAgICAgICAg ICAnL21vY2stY2hlY2tvdXQvV2ViS2l0QnVpbGQvdzNjLXRlc3RzL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLWdyaWQvTUVUQS55bWwnOiAnbmV3bWV0YScsCisgICAgICAgICAgICAnL21vY2st Y2hlY2tvdXQvV2ViS2l0QnVpbGQvdzNjLXRlc3RzL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LW1hZ2ljL3Rlc3QxLmh0bWwnOiAnbmV3dGVzdDEnLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNr b3V0L1dlYktpdEJ1aWxkL3czYy10ZXN0cy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1tYWdp Yy90ZXN0Mi5odG1sJzogJ25ld3Rlc3QyJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9X ZWJLaXRCdWlsZC93M2MtdGVzdHMvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtbWFnaWMvcmVz b3VyY2VzL3Rlc3QuanMnOiAnbmV3dGVzdC5qcycsCisgICAgICAgICAgICAnL21vY2stY2hlY2tv dXQvV2ViS2l0QnVpbGQvdzNjLXRlc3RzL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLW1hZ2lj L01FVEEueW1sJzogJ25ld21ldGEnLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L1dlYktp dEJ1aWxkL3czYy10ZXN0cy93ZWItcGxhdGZvcm0tdGVzdHMvd2VibWlkaS90ZXN0MS5odG1sJzog J25ld3Rlc3QxJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9XZWJLaXRCdWlsZC93M2Mt dGVzdHMvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYm1pZGkvdGVzdDIuaHRtbCc6ICduZXd0ZXN0Mics CisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvV2ViS2l0QnVpbGQvdzNjLXRlc3RzL3dlYi1w bGF0Zm9ybS10ZXN0cy93ZWJtaWRpL3Jlc291cmNlcy90ZXN0LmpzJzogJ25ld3Rlc3QuanMnLAor ICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L1dlYktpdEJ1aWxkL3czYy10ZXN0cy93ZWItcGxh dGZvcm0tdGVzdHMvd2VibWlkaS9NRVRBLnltbCc6ICduZXdtZXRhJywKKyAgICAgICAgICAgICcv bW9jay1jaGVja291dC9XZWJLaXRCdWlsZC93M2MtdGVzdHMvd2ViLXBsYXRmb3JtLXRlc3RzL3N2 Zy90ZXN0MS5odG1sJzogJ25ld3Rlc3QxJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9X ZWJLaXRCdWlsZC93M2MtdGVzdHMvd2ViLXBsYXRmb3JtLXRlc3RzL3N2Zy90ZXN0Mi5odG1sJzog J25ld3Rlc3QyJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9XZWJLaXRCdWlsZC93M2Mt dGVzdHMvd2ViLXBsYXRmb3JtLXRlc3RzL3N2Zy9yZXNvdXJjZXMvdGVzdC5qcyc6ICduZXd0ZXN0 LmpzJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9XZWJLaXRCdWlsZC93M2MtdGVzdHMv d2ViLXBsYXRmb3JtLXRlc3RzL3N2Zy9NRVRBLnltbCc6ICduZXdtZXRhJywKKyAgICAgICAgICAg ICcvbW9jay1jaGVja291dC9XZWJLaXRCdWlsZC93M2MtdGVzdHMvd2ViLXBsYXRmb3JtLXRlc3Rz L3N2Zy9zdmctZnV0dXJlL3Rlc3QxLmh0bWwnOiAnbmV3dGVzdDEnLAorICAgICAgICAgICAgJy9t b2NrLWNoZWNrb3V0L1dlYktpdEJ1aWxkL3czYy10ZXN0cy93ZWItcGxhdGZvcm0tdGVzdHMvc3Zn L3N2Zy1mdXR1cmUvdGVzdDIuaHRtbCc6ICduZXd0ZXN0MicsCisgICAgICAgICAgICAnL21vY2st Y2hlY2tvdXQvV2ViS2l0QnVpbGQvdzNjLXRlc3RzL3dlYi1wbGF0Zm9ybS10ZXN0cy9zdmcvc3Zn LWZ1dHVyZS9yZXNvdXJjZXMvdGVzdC5qcyc6ICduZXd0ZXN0LmpzJywKKyAgICAgICAgICAgICcv bW9jay1jaGVja291dC9XZWJLaXRCdWlsZC93M2MtdGVzdHMvd2ViLXBsYXRmb3JtLXRlc3RzL3N2 Zy9zdmctZnV0dXJlL01FVEEueW1sJzogJ25ld21ldGEnCisgICAgICAgIH0KKworICAgICAgICBm cyA9IHNlbGYuaW1wb3J0X2Rvd25sb2FkZWRfdGVzdHMoWyctLW5vLWZldGNoJywgJy0tdXBkYXRl LWltcG9ydCddLCBGQUtFX0ZJTEVTKQorCisgICAgICAgIGZvciByZXNvdXJjZV9maWxlIGluIFsn dGVzdDEuaHRtbCcsICd0ZXN0Mi5odG1sJywgICdNRVRBLnltbCcsICdyZXNvdXJjZXMvdGVzdC5q cyddOgorICAgICAgICAgICAgZm9yIGV4cGVjdGVkX3VwZGF0ZWRfc3VpdGUgaW4gWydjc3MvY3Nz LWZsZXhib3gnLCAnY3NzL2Nzcy1ncmlkJywgJ3N2ZyddOgorICAgICAgICAgICAgICAgIGZ1bGxf cGF0aF9leHBlY3RlZF9pbXBvcnRfZmlsZSA9IG9zLnBhdGguam9pbignL21vY2stY2hlY2tvdXQv TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cycsIGV4cGVjdGVkX3Vw ZGF0ZWRfc3VpdGUsIHJlc291cmNlX2ZpbGUpCisgICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRU cnVlKGZzLmV4aXN0cyhmdWxsX3BhdGhfZXhwZWN0ZWRfaW1wb3J0X2ZpbGUpKQorICAgICAgICAg ICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShmcy5yZWFkX3RleHRfZmlsZShmdWxsX3BhdGhfZXhwZWN0 ZWRfaW1wb3J0X2ZpbGUpLnN0YXJ0c3dpdGgoIm5ldyIpKQorICAgICAgICAgICAgZm9yIGV4cGVj dGVkX2lnbm9yZWRfc3VpdGUgaW4gWydjc3MvY3NzLW1hZ2ljJywgJ3dlYm1pZGknLCAnc3ZnL3N2 Zy1mdXR1cmUnXToKKyAgICAgICAgICAgICAgICBmdWxsX3BhdGhfZXhwZWN0ZWRfaWdub3JlX2Zp bGUgPSBvcy5wYXRoLmpvaW4oJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMnLCBleHBlY3RlZF9pZ25vcmVkX3N1aXRlLCByZXNvdXJjZV9m aWxlKQorICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoZnMuZXhpc3RzKGZ1bGxfcGF0 aF9leHBlY3RlZF9pZ25vcmVfZmlsZSkpCg==