231805 2021-10-15 07:04:12 -0700 Mark more tests as slow for pytest 2021-10-22 07:05:13 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified NEW https://bugs.webkit.org/show_bug.cgi?id=225156 InRadar P2 Normal --- 1 gsnedders gsnedders ews-watchlist glenn jbedard webkit-bug-importer oldest_to_newest 1804794 0 gsnedders 2021-10-15 07:04:12 -0700 This goes beyond bug 225156 by marking everything that takes > 0.5s to run on my MacBook Pro (16-inch, 2019) as slow. This makes a larger number of tests get skipped by default than with ./Tools/Scripts/test-webkitpy, but halves the execution time. Having looked at a graph of test execution time, I think the > 0.5s cutoff is the right one to balance running as much as possible as quickly as possible. 1804815 1 441380 gsnedders 2021-10-15 08:21:26 -0700 Created attachment 441380 Patch 1804821 2 441380 jbedard 2021-10-15 08:28:21 -0700 Comment on attachment 441380 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=441380&action=review > Tools/Scripts/webkitpy/style/main_unittest.py:36 > +from webkitpy.test.markers import slow Can we maybe not do this file? I only call it out because the style checker is the thing engineers not familiar with webkitpy are most likely to change. Would be good if we kept full coverage for folks making those changes, since they're unlikely to know to change the flags they're passing to test-webkitpy. 1804822 3 gsnedders 2021-10-15 08:31:12 -0700 (In reply to Jonathan Bedard from comment #2) > Comment on attachment 441380 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=441380&action=review > > > Tools/Scripts/webkitpy/style/main_unittest.py:36 > > +from webkitpy.test.markers import slow > > Can we maybe not do this file? I only call it out because the style checker > is the thing engineers not familiar with webkitpy are most likely to change. > Would be good if we kept full coverage for folks making those changes, since > they're unlikely to know to change the flags they're passing to > test-webkitpy. Note that this currently has no impact on `test-webkitpy`; there's probably an argument that we want to default to running all the tests and then allowing developers to opt-in to running the "not slow" subset (which once we're using pytest everywhere is just `pytest -m 'not slow'`). 1807660 4 webkit-bug-importer 2021-10-22 07:05:13 -0700 <rdar://problem/84548211> 441380 2021-10-15 08:21:26 -0700 2021-10-15 12:29:54 -0700 Patch bug-231805-20211015162125.patch text/plain 19323 gsnedders U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MjQxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODFmYTIzMTVjMjc5NjBlZmJiYWUyYWFkYTQ1MWZhNDNm NzBhYWE4OS4uZTIwMzExZDdhMmRjNTAyZWQ4MmU0MGQwNWIwMWRhOWE1ZGQxNzY0ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUx IEBACisyMDIxLTEwLTE1ICBTYW0gU25lZGRvbiAgPGdzbmVkZGVyc0BhcHBsZS5jb20+CisKKyAg ICAgICAgTWFyayBtb3JlIHRlc3RzIGFzIHNsb3cgZm9yIHB5dGVzdAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxODA1CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBnb2VzIGJleW9uZCBidWcgMjI1 MTU2IGJ5IG1hcmtpbmcgZXZlcnl0aGluZyB0aGF0IHRha2VzID4gMC41cyB0byBydW4gb24gbXkK KyAgICAgICAgTWFjQm9vayBQcm8gKDE2LWluY2gsIDIwMTkpIGFzIHNsb3cuIFRoaXMgbWFrZXMg YSBsYXJnZXIgbnVtYmVyIG9mIHRlc3RzIGdldAorICAgICAgICBza2lwcGVkIGJ5IGRlZmF1bHQg dGhhbiB3aXRoIC4vVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5LCBidXQgaGFsdmVzIHRoZQor ICAgICAgICBleGVjdXRpb24gdGltZS4gSGF2aW5nIGxvb2tlZCBhdCBhIGdyYXBoIG9mIHRlc3Qg ZXhlY3V0aW9uIHRpbWUsIEkgdGhpbmsgdGhlID4wLjVzCisgICAgICAgIGN1dG9mZiBpcyB0aGUg cmlnaHQgb25lIHRvIGJhbGFuY2UgcnVubmluZyBhcyBtdWNoIGFzIHBvc3NpYmxlIGFzIHF1aWNr bHkgYXMKKyAgICAgICAgcG9zc2libGUuCisKKyAgICAgICAgQWRkaXRpb25hbGx5LCB0aGlzIG1h cmtzIGV2ZXJ5dGhpbmcgdGhhdCBkZWFscyB3aXRoIChzeXN0ZW0tdW5pcXVlKSBUQ1AgcG9ydAor ICAgICAgICBudW1iZXJzIGluIFBvcnRUZXN0Q2FzZSBhcyBzZXJpYWwgdG8gcHJlc2VydmUgc3Rh YmlsaXR5IHdoZW4gcnVubmluZyBpbiBwYXJhbGxlbC4KKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHk6CisgICAgICAgIChHaXRU ZXN0KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZl X3VuaXR0ZXN0LnB5OgorICAgICAgICAoRXhlY3V0aXZlVGVzdCk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHNfdW5pdHRlc3Qu cHk6CisgICAgICAgIChTdW1tYXJpemVkUmVzdWx0c1Rlc3QpOgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5 OgorICAgICAgICAoTWFpblRlc3QpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3NlcnZlcnMvd2ViX3BsYXRmb3JtX3Rlc3Rfc2VydmVyX3VuaXR0ZXN0LnB5OgorICAg ICAgICAoVGVzdFdlYlBsYXRmb3JtVGVzdFNlcnZlcik6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9wb3J0L2NvbmZpZ191bml0dGVzdC5weToKKyAgICAgICAgKENvbmZpZ1Rlc3QpOgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5OgorICAgICAgICAo UG9ydFRlc3RDYXNlLnNlcmlhbF9pbnRlZ3JhdGlvbl90ZXN0X2h0dHBfc2VydmVyX19ub3JtYWwp OgorICAgICAgICAoUG9ydFRlc3RDYXNlLnNlcmlhbF9pbnRlZ3JhdGlvbl90ZXN0X2h0dHBfc2Vy dmVyX19mYWlscyk6CisgICAgICAgIChQb3J0VGVzdENhc2Uuc2VyaWFsX2ludGVncmF0aW9uX3Rl c3RfaHR0cF9zZXJ2ZXJfX3R3b19zZXJ2ZXJzKToKKyAgICAgICAgKFBvcnRUZXN0Q2FzZS5zZXJp YWxfaW50ZWdyYXRpb25fdGVzdF93ZWJzb2NrZXRfc2VydmVyX19ub3JtYWwpOgorICAgICAgICAo UG9ydFRlc3RDYXNlLnNlcmlhbF9pbnRlZ3JhdGlvbl90ZXN0X3dlYnNvY2tldF9zZXJ2ZXJfX2Zh aWxzKToKKyAgICAgICAgKFBvcnRUZXN0Q2FzZS5zZXJpYWxfaW50ZWdyYXRpb25fdGVzdF93ZWJz b2NrZXRfc2VydmVyX190d29fc2VydmVycyk6CisgICAgICAgIChQb3J0VGVzdENhc2Uuc2VyaWFs X2ludGVncmF0aW9uX3Rlc3RfaHR0cF9zZXJ2ZXJfX2xvb3ApOgorICAgICAgICAoUG9ydFRlc3RD YXNlLmludGVncmF0aW9uX3Rlc3RfaHR0cF9zZXJ2ZXJfX25vcm1hbCk6IERlbGV0ZWQuCisgICAg ICAgIChQb3J0VGVzdENhc2UuaW50ZWdyYXRpb25fdGVzdF9odHRwX3NlcnZlcl9fZmFpbHMpOiBE ZWxldGVkLgorICAgICAgICAoUG9ydFRlc3RDYXNlLmludGVncmF0aW9uX3Rlc3RfaHR0cF9zZXJ2 ZXJfX3R3b19zZXJ2ZXJzKTogRGVsZXRlZC4KKyAgICAgICAgKFBvcnRUZXN0Q2FzZS5pbnRlZ3Jh dGlvbl90ZXN0X3dlYnNvY2tldF9zZXJ2ZXJfX25vcm1hbCk6IERlbGV0ZWQuCisgICAgICAgIChQ b3J0VGVzdENhc2UuaW50ZWdyYXRpb25fdGVzdF93ZWJzb2NrZXRfc2VydmVyX19mYWlscyk6IERl bGV0ZWQuCisgICAgICAgIChQb3J0VGVzdENhc2UuaW50ZWdyYXRpb25fdGVzdF93ZWJzb2NrZXRf c2VydmVyX190d29fc2VydmVycyk6IERlbGV0ZWQuCisgICAgICAgIChQb3J0VGVzdENhc2UuaW50 ZWdyYXRpb25fdGVzdF9odHRwX3NlcnZlcl9fbG9vcCk6IERlbGV0ZWQuCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9zdHlsZS9tYWluX3VuaXR0ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvdGVzdC9tYWluX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdGVyVGVzdCk6CisK IDIwMjEtMTAtMTQgIEpvaG4gV2lsYW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CiAKICAgICAg ICAgVGVzdFdlYktpdEFQSS5Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC5GcmF1ZFByZXZlbnRpb24g aXMgYSBjb25zdGFudCB0aW1lb3V0CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weQppbmRleCBhMmUxZmEwNjM3 Yzc3ZGIzODNhNmNlYmM2NTI1NzZhN2RjM2U0ZGU3Li44NTBkM2NhZjc5NTA2YTQ5OGExNzlkOTQ1 ODg5M2FjM2Y0OWJhMGZhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHkKQEAgLTExMDgsNiArMTEwOCw3 IEBAIGNsYXNzIEdpdFRlc3QoU0NNVGVzdCk6CiAgICAgICAgIHNlbGYuYXNzZXJ0Tm90UmVnZXhw TWF0Y2hlcyhwYXRjaCwgYid0aGlyZCcpCiAgICAgICAgIHNlbGYuYXNzZXJ0Tm90UmVnZXhwTWF0 Y2hlcyhwYXRjaCwgYid1bmljb3JuJykKIAorICAgIEBzbG93CiAgICAgZGVmIHRlc3Rfb3JkZXJm aWxlKHNlbGYpOgogICAgICAgICBvcy5ta2RpcigiVG9vbHMiKQogICAgICAgICBvcy5ta2Rpcigi U291cmNlIikKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3Rl bS9leGVjdXRpdmVfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9z eXN0ZW0vZXhlY3V0aXZlX3VuaXR0ZXN0LnB5CmluZGV4IGIwODM1ODVmMTA2ZTdkYTQ5MTkyMTU4 MjZjMGU0OWE0Yjg1ZTU2NGIuLjE5YjE4NzBlNWQ5NDQzYmJmYzc2MjJlODQ3YTA1MzdmN2UyZGJk M2EgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVj dXRpdmVfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lz dGVtL2V4ZWN1dGl2ZV91bml0dGVzdC5weQpAQCAtNDUsNiArNDUsNyBAQCBpZiB0aGlyZF9wYXJ0 eV9weSBub3QgaW4gc3lzLnBhdGg6CiAKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5leGVj dXRpdmUgaW1wb3J0IEV4ZWN1dGl2ZSwgU2NyaXB0RXJyb3IKIGZyb20gd2Via2l0cHkuY29tbW9u LnN5c3RlbS5maWxlc3lzdGVtX21vY2sgaW1wb3J0IE1vY2tGaWxlU3lzdGVtCitmcm9tIHdlYmtp dHB5LnRlc3QubWFya2VycyBpbXBvcnQgc2xvdwogCiBmcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQg c3RyaW5nX3V0aWxzCiAKQEAgLTExMCw2ICsxMTEsNyBAQCBjbGFzcyBFeGVjdXRpdmVUZXN0KHVu aXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoU2NyaXB0RXJyb3Is IGxhbWJkYTogRXhlY3V0aXZlKCkucnVuX2NvbW1hbmQoWydweXRob24nLCAnLWMnLCAnaW1wb3J0 IHN5czsgc3lzLmV4aXQoMSknXSkpCiAgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKFNjcmlwdEVy cm9yLCBsYW1iZGE6IEV4ZWN1dGl2ZSgpLnJ1bl9hbmRfdGhyb3dfaWZfZmFpbChbJ3B5dGhvbics ICctYycsICdpbXBvcnQgc3lzOyBzeXMuZXhpdCgxKSddLCBxdWlldD1UcnVlKSkKIAorICAgIEBz bG93CiAgICAgZGVmIHRlc3RfcnVuX2NvbW1hbmRfYXJnc190eXBlKHNlbGYpOgogICAgICAgICBl eGVjdXRpdmUgPSBFeGVjdXRpdmUoKQogICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhBc3NlcnRp b25FcnJvciwgZXhlY3V0aXZlLnJ1bl9jb21tYW5kLCAiZWNobyIpCkBAIC0xMTcsNiArMTE5LDcg QEAgY2xhc3MgRXhlY3V0aXZlVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIGV4ZWN1 dGl2ZS5ydW5fY29tbWFuZChjb21tYW5kX2xpbmUoJ2VjaG8nLCAnZm9vJykpCiAgICAgICAgIGV4 ZWN1dGl2ZS5ydW5fY29tbWFuZCh0dXBsZShjb21tYW5kX2xpbmUoJ2VjaG8nLCAnZm9vJykpKQog CisgICAgQHNsb3cKICAgICBkZWYgdGVzdF9hdXRvX3N0cmluZ2lmeV9hcmdzKHNlbGYpOgogICAg ICAgICBleGVjdXRpdmUgPSBFeGVjdXRpdmUoKQogICAgICAgICBleGVjdXRpdmUucnVuX2NvbW1h bmQoY29tbWFuZF9saW5lKCdlY2hvJywgMSkpCkBAIC0xMjQsMTIgKzEyNywxNCBAQCBjbGFzcyBF eGVjdXRpdmVUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgIHByb2Nlc3Mud2Fp dCgpCiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdlY2hvIDEnLCBleGVjdXRpdmUuY29t bWFuZF9mb3JfcHJpbnRpbmcoWydlY2hvJywgMV0pKQogCisgICAgQHNsb3cKICAgICBkZWYgdGVz dF9wb3Blbl9hcmdzKHNlbGYpOgogICAgICAgICBleGVjdXRpdmUgPSBFeGVjdXRpdmUoKQogICAg ICAgICAjIEV4cGxpY2l0bHkgbmFtaW5nIHRoZSAnYXJncycgYXJndW1lbnQgc2hvdWxkIG5vdCB0 aG93IGFuIGV4Y2VwdGlvbi4KICAgICAgICAgd2l0aCBleGVjdXRpdmUucG9wZW4oYXJncz1jb21t YW5kX2xpbmUoJ2VjaG8nLCAxKSwgc3Rkb3V0PWV4ZWN1dGl2ZS5QSVBFKSBhcyBwcm9jZXNzOgog ICAgICAgICAgICAgcHJvY2Vzcy53YWl0KCkKIAorICAgIEBzbG93CiAgICAgZGVmIHRlc3RfcnVu X2NvbW1hbmRfd2l0aF91bmljb2RlKHNlbGYpOgogICAgICAgICAiIiJWYWxpZGF0ZSB0aGF0IGl0 IGlzIHNhZmUgdG8gcGFzcyB1bmljb2RlKCkgb2JqZWN0cwogICAgICAgICB0byBFeGVjdXRpdmUu cnVuKiBtZXRob2RzLCBhbmQgdGhleSB3aWxsIHJldHVybiB1bmljb2RlKCkKQEAgLTIzOCw2ICsy NDMsNyBAQCBjbGFzcyBFeGVjdXRpdmVUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAg cGlkcyA9IGV4ZWN1dGl2ZS5ydW5uaW5nX3BpZHMoKQogICAgICAgICBzZWxmLmFzc2VydEluKG9z LmdldHBpZCgpLCBwaWRzKQogCisgICAgQHNsb3cKICAgICBkZWYgc2VyaWFsX3Rlc3RfcnVuX2lu X3BhcmFsbGVsKHNlbGYpOgogICAgICAgICAjIFdlIHJ1biB0aGlzIHRlc3Qgc2VyaWFsbHkgdG8g YXZvaWQgb3ZlcmxvYWRpbmcgdGhlIG1hY2hpbmUgYW5kIHRocm93aW5nIG9mZiB0aGUgdGltaW5n LgogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2Rl bHMvdGVzdF9ydW5fcmVzdWx0c191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzX3VuaXR0ZXN0LnB5CmluZGV4IDA5 MGRkMTUzMGEzMDYyNGE3ODc1Y2JmY2ExYmM2MjIyYjFmNDVlYjguLmMyY2JmMTJhOGNmMTI3ODJk YTJjZGQ0MmJhODFlOTA5MjNiZWRmMGIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzX3VuaXR0ZXN0LnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1 bHRzX3VuaXR0ZXN0LnB5CkBAIC0zNCw2ICszNCw3IEBAIGZyb20gd2Via2l0cHkubGF5b3V0X3Rl c3RzLm1vZGVscyBpbXBvcnQgdGVzdF9mYWlsdXJlcwogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVz dHMubW9kZWxzIGltcG9ydCB0ZXN0X3Jlc3VsdHMKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3Rz Lm1vZGVscyBpbXBvcnQgdGVzdF9ydW5fcmVzdWx0cwogZnJvbSB3ZWJraXRweS50b29sLm1vY2t0 b29sIGltcG9ydCBNb2NrT3B0aW9ucworZnJvbSB3ZWJraXRweS50ZXN0Lm1hcmtlcnMgaW1wb3J0 IHNsb3cKIAogZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IE91dHB1dENhcHR1cmUKIGZyb20gd2Vi a2l0c2NtcHkgaW1wb3J0IG1vY2tzCkBAIC0xNTUsNiArMTU2LDcgQEAgY2xhc3MgU3VtbWFyaXpl ZFJlc3VsdHNUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc3VtbWFyeSA9IHN1bW1h cml6ZWRfcmVzdWx0cyhzZWxmLnBvcnQsIGV4cGVjdGVkPUZhbHNlLCBwYXNzaW5nPUZhbHNlLCBm bGFreT1GYWxzZSkKICAgICAgICAgc2VsZi5hc3NlcnROb3RJbigncmV2aXNpb24nLCBzdW1tYXJ5 KQogCisgICAgQHNsb3cKICAgICBkZWYgdGVzdF9zdm5fcmV2aXNpb25fZXhpc3RzKHNlbGYpOgog ICAgICAgICBzZWxmLnBvcnQuX29wdGlvbnMuYnVpbGRlcl9uYW1lID0gJ2R1bW15IGJ1aWxkZXIn CiAgICAgICAgIHN1bW1hcnkgPSBzdW1tYXJpemVkX3Jlc3VsdHMoc2VsZi5wb3J0LCBleHBlY3Rl ZD1GYWxzZSwgcGFzc2luZz1GYWxzZSwgZmxha3k9RmFsc2UpCkBAIC0xNzIsMTYgKzE3NCwxOSBA QCBjbGFzcyBTdW1tYXJpemVkUmVzdWx0c1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAg ICAgICAgc3VtbWFyeSA9IHN1bW1hcml6ZWRfcmVzdWx0cyhzZWxmLnBvcnQsIGV4cGVjdGVkPUZh bHNlLCBwYXNzaW5nPUZhbHNlLCBmbGFreT1GYWxzZSkKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWxzKHN1bW1hcnlbJ3JldmlzaW9uJ10sICc5JykKIAorICAgIEBzbG93CiAgICAgZGVmIHRl c3Rfc3VtbWFyaXplZF9yZXN1bHRzX3dvbnRmaXgoc2VsZik6CiAgICAgICAgIHNlbGYucG9ydC5f b3B0aW9ucy5idWlsZGVyX25hbWUgPSAnZHVtbXkgYnVpbGRlcicKICAgICAgICAgc3VtbWFyeSA9 IHN1bW1hcml6ZWRfcmVzdWx0cyhzZWxmLnBvcnQsIGV4cGVjdGVkPUZhbHNlLCBwYXNzaW5nPUZh bHNlLCBmbGFreT1GYWxzZSkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHN1bW1hcnlbJ3Rlc3Rz J11bJ2ZhaWx1cmVzJ11bJ2V4cGVjdGVkJ11bJ2hhbmcuaHRtbCddWyd3b250Zml4J10pCiAKKyAg ICBAc2xvdwogICAgIGRlZiB0ZXN0X3N1bW1hcml6ZWRfcmVzdWx0c19pbmNsdWRlX3Bhc3Nlcyhz ZWxmKToKICAgICAgICAgc2VsZi5wb3J0Ll9vcHRpb25zLmJ1aWxkZXJfbmFtZSA9ICdkdW1teSBi dWlsZGVyJwogICAgICAgICBzdW1tYXJ5ID0gc3VtbWFyaXplZF9yZXN1bHRzKHNlbGYucG9ydCwg ZXhwZWN0ZWQ9RmFsc2UsIHBhc3Npbmc9VHJ1ZSwgZmxha3k9RmFsc2UsIGluY2x1ZGVfcGFzc2Vz PVRydWUpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3VtbWFyeVsndGVzdHMnXVsncGFzc2Vz J11bJ3RleHQuaHRtbCddWydleHBlY3RlZCddLCAnUEFTUycpCiAKKyAgICBAc2xvdwogICAgIGRl ZiB0ZXN0X3N1bW1hcml6ZWRfcmVzdWx0c193b3JsZF9sZWFrc19kaXNhYmxlZChzZWxmKToKICAg ICAgICAgc2VsZi5wb3J0Ll9vcHRpb25zLmJ1aWxkZXJfbmFtZSA9ICdkdW1teSBidWlsZGVyJwog ICAgICAgICBzdW1tYXJ5ID0gc3VtbWFyaXplZF9yZXN1bHRzKHNlbGYucG9ydCwgZXhwZWN0ZWQ9 RmFsc2UsIHBhc3Npbmc9VHJ1ZSwgZmxha3k9RmFsc2UsIGluY2x1ZGVfcGFzc2VzPVRydWUpCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0 X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5CmluZGV4IGU2N2VjZTUw N2Q0MGEzOTgwNzlmMzIzZWU3YTU3Y2VmOTZmY2I0NDcuLmRhZGYxYzI0MjkxZGJhZTIzNmVjMmIz Yjc1ZTFhYWVkNTZjMDMwNDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRp b250ZXN0LnB5CkBAIC00Miw2ICs0Miw3IEBAIGZyb20gd2Via2l0cHkuY29tbW9uLmhvc3RfbW9j ayBpbXBvcnQgTW9ja0hvc3QKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzIGltcG9ydCBydW5f d2Via2l0X3Rlc3RzCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMudGVzdF9ydW5f cmVzdWx0cyBpbXBvcnQgSU5URVJSVVBURURfRVhJVF9TVEFUVVMKIGZyb20gd2Via2l0cHkucG9y dCBpbXBvcnQgdGVzdAorZnJvbSB3ZWJraXRweS50ZXN0Lm1hcmtlcnMgaW1wb3J0IHNsb3cKIGZy b20gd2Via2l0cHkueGNvZGUuZGV2aWNlX3R5cGUgaW1wb3J0IERldmljZVR5cGUKIAogCkBAIC0x MDU1LDYgKzEwNTYsNyBAQCBjbGFzcyBQb3J0VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAKIAog Y2xhc3MgTWFpblRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgorICAgIEBzbG93CiAgICAgZGVmIHRl c3RfZXhjZXB0aW9uX2hhbmRsaW5nKHNlbGYpOgogICAgICAgICBvcmlnX3J1bl9mbiA9IHJ1bl93 ZWJraXRfdGVzdHMucnVuCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3NlcnZlcnMvd2ViX3BsYXRmb3JtX3Rlc3Rfc2VydmVyX3VuaXR0ZXN0LnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy93ZWJfcGxhdGZvcm1f dGVzdF9zZXJ2ZXJfdW5pdHRlc3QucHkKaW5kZXggODk2Y2ViMTY1MzlkYmQ5NTM1ZDQ1MDcwNjVl YjNiM2RiNzFlODI0Zi4uY2UyMDczMmU5NDQzMWY1NzI3Mzc1OWFlNDdjMjliNWQ2OGRlZjgwOSAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy93 ZWJfcGxhdGZvcm1fdGVzdF9zZXJ2ZXJfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy93ZWJfcGxhdGZvcm1fdGVzdF9zZXJ2ZXJfdW5p dHRlc3QucHkKQEAgLTMwLDYgKzMwLDcgQEAgaW1wb3J0IHVuaXR0ZXN0CiBmcm9tIHdlYmtpdHB5 LmNvbW1vbi5ob3N0X21vY2sgaW1wb3J0IE1vY2tIb3N0CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5z eXN0ZW0uZmlsZXN5c3RlbSBpbXBvcnQgRmlsZVN5c3RlbQogZnJvbSB3ZWJraXRweS5wb3J0IGlt cG9ydCBQb3J0Citmcm9tIHdlYmtpdHB5LnRlc3QubWFya2VycyBpbXBvcnQgc2xvdwogZnJvbSB3 ZWJraXRweS50b29sLm1vY2t0b29sIGltcG9ydCBNb2NrT3B0aW9ucwogCiBmcm9tIHdlYmtpdHB5 LmxheW91dF90ZXN0cy5zZXJ2ZXJzLmh0dHBfc2VydmVyX2Jhc2UgaW1wb3J0IFNlcnZlckVycm9y CkBAIC0zNyw2ICszOCw3IEBAIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnNlcnZlcnMud2Vi X3BsYXRmb3JtX3Rlc3Rfc2VydmVyIGltcG9ydCBXZWJQbGF0Zm9ybVRlCiAKIAogY2xhc3MgVGVz dFdlYlBsYXRmb3JtVGVzdFNlcnZlcih1bml0dGVzdC5UZXN0Q2FzZSk6CisgICAgQHNsb3cKICAg ICBkZWYgdGVzdF9wcmV2aW91c2x5X3NwYXduZWRfaW5zdGFuY2Uoc2VsZik6CiAgICAgICAgIGhv c3QgPSBNb2NrSG9zdCgpCiAgICAgICAgIG9wdGlvbnMgPSBvcHRwYXJzZS5WYWx1ZXMoKQpAQCAt NTIsNiArNTQsNyBAQCBjbGFzcyBUZXN0V2ViUGxhdGZvcm1UZXN0U2VydmVyKHVuaXR0ZXN0LlRl c3RDYXNlKToKICAgICAgICAgc2VydmVyLnN0YXJ0KCkKICAgICAgICAgc2VydmVyLnN0b3AoKQog CisgICAgQHNsb3cKICAgICBkZWYgdGVzdF9jdXN0b21fbGF5b3V0X3Rlc3RzX2RpcmVjdG9yeShz ZWxmKToKICAgICAgICAgaG9zdCA9IE1vY2tIb3N0KCkKICAgICAgICAgb3B0aW9ucyA9IG9wdHBh cnNlLlZhbHVlcygpCkBAIC02OCw2ICs3MSw3IEBAIGNsYXNzIFRlc3RXZWJQbGF0Zm9ybVRlc3RT ZXJ2ZXIodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZXJ2ZXIuc3RhcnQoKQogICAgICAg ICBzZXJ2ZXIuc3RvcCgpCiAKKyAgICBAc2xvdwogICAgIGRlZiB0ZXN0X2NvcnJ1cHRlZF9zdWJz ZXJ2ZXJfZmlsZXMoc2VsZik6CiAgICAgICAgIGhvc3QgPSBNb2NrSG9zdCgpCiAgICAgICAgIG9w dGlvbnMgPSBvcHRwYXJzZS5WYWx1ZXMoKQpAQCAtOTgsNiArMTAyLDcgQEAgY2xhc3MgVGVzdFdl YlBsYXRmb3JtVGVzdFNlcnZlcih1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNz ZXJ0RmFsc2UoaG9zdC5maWxlc3lzdGVtLmV4aXN0cygiL21vY2svb3V0cHV0X2Rpci93cHR0ZXN0 X3NlcnZlcnMuanNvbiIpKQogICAgICAgICBzZXJ2ZXIuc3RvcCgpCiAKKyAgICBAc2xvdwogICAg IGRlZiB0ZXN0X3NlcnZlcl9mYWlsc190b19zdGFydF90aHJvd3NfZXhjZXB0aW9uKHNlbGYpOgog ICAgICAgICBob3N0ID0gTW9ja0hvc3QoKQogICAgICAgICBvcHRpb25zID0gb3B0cGFyc2UuVmFs dWVzKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9jb25maWdfdW5p dHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvY29uZmlnX3VuaXR0ZXN0LnB5 CmluZGV4IDk5MzZkNzRhYWM0ZTVjODg2OTkzNDg3NTk1MGRkMmVmMDM5ZGZlZDEuLjE2ZWVkNTgy M2MzZTcxYzZlNmU4YjJmNTM2NzE5YjFlOGI1MjM4NTMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC9jb25maWdfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9wb3J0L2NvbmZpZ191bml0dGVzdC5weQpAQCAtMzUsNiArMzUsNyBAQCBmcm9tIHdl YmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlX21vY2sgaW1wb3J0IE1vY2tFeGVjdXRpdmUy CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZmlsZXN5c3RlbSBpbXBvcnQgRmlsZVN5c3Rl bQogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmZpbGVzeXN0ZW1fbW9jayBpbXBvcnQgTW9j a0ZpbGVTeXN0ZW0KIGZyb20gd2Via2l0cHkuY29tbW9uLndlYmtpdF9maW5kZXIgaW1wb3J0IFdl YktpdEZpbmRlcgorZnJvbSB3ZWJraXRweS50ZXN0Lm1hcmtlcnMgaW1wb3J0IHNsb3cKIAogZnJv bSB3ZWJraXRjb3JlcHkgaW1wb3J0IE91dHB1dENhcHR1cmUKIApAQCAtMTIyLDYgKzEyMyw3IEBA IGNsYXNzIENvbmZpZ1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICB3aXRoIE91dHB1 dENhcHR1cmUoKToKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0X2NvbmZpZ3VyYXRpb24oJ1Vua25v d24nLCAnVW5rbm93bicpCiAKKyAgICBAc2xvdwogICAgIGRlZiB0ZXN0X2RlZmF1bHRfY29uZmln dXJhdGlvbl9fc3RhbmRhbG9uZShzZWxmKToKICAgICAgICAgIyBGSVhNRTogVGhpcyB0ZXN0IHJ1 bnMgYSBzdGFuZGFsb25lIHB5dGhvbiBzY3JpcHQgdG8gdGVzdAogICAgICAgICAjIHJlYWRpbmcg dGhlIGRlZmF1bHQgY29uZmlndXJhdGlvbiB0byB3b3JrIGFyb3VuZCBhbnkgcG9zc2libGUKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3BvcnRfdGVzdGNhc2UucHkKaW5kZXggZTVhOTZj ZDgwNTQxNDA2ZGJjZTA2OWZjYmVkYmIwMWQyMDhhNjQwOS4uMDM4ZDM4Y2E5OTdjMWMwY2ViOThl Yzc4NzBjZDlhZWY3MDAzOTFiYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9w b3J0L3BvcnRfdGVzdGNhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3Bv cnRfdGVzdGNhc2UucHkKQEAgLTE3Niw3ICsxNzYsNyBAQCBjbGFzcyBQb3J0VGVzdENhc2UodW5p dHRlc3QuVGVzdENhc2UpOgogICAgICAgICBwb3J0LnN0b3BfaGVscGVyKCkKIAogICAgIEB4ZmFp bAotICAgIGRlZiBpbnRlZ3JhdGlvbl90ZXN0X2h0dHBfc2VydmVyX19ub3JtYWwoc2VsZik6Cisg ICAgZGVmIHNlcmlhbF9pbnRlZ3JhdGlvbl90ZXN0X2h0dHBfc2VydmVyX19ub3JtYWwoc2VsZik6 CiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCiAgICAgICAgIHNlbGYuYXNzZXJ0X3Nl cnZlcnNfYXJlX2Rvd24oJ2xvY2FsaG9zdCcsIHNlbGYuSFRUUF9QT1JUUykKICAgICAgICAgcG9y dC5zdGFydF9odHRwX3NlcnZlcigpCkBAIC0xODUsNyArMTg1LDcgQEAgY2xhc3MgUG9ydFRlc3RD YXNlKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRfc2VydmVyc19hcmVf ZG93bignbG9jYWxob3N0Jywgc2VsZi5IVFRQX1BPUlRTKQogCiAgICAgQHhmYWlsCi0gICAgZGVm IGludGVncmF0aW9uX3Rlc3RfaHR0cF9zZXJ2ZXJfX2ZhaWxzKHNlbGYpOgorICAgIGRlZiBzZXJp YWxfaW50ZWdyYXRpb25fdGVzdF9odHRwX3NlcnZlcl9fZmFpbHMoc2VsZik6CiAgICAgICAgIHBv cnQgPSBzZWxmLm1ha2VfcG9ydCgpCiAgICAgICAgICMgVGVzdCB0aGF0IGlmIGEgcG9ydCBpc24n dCBhdmFpbGFibGUsIHRoZSBjYWxsIGZhaWxzLgogICAgICAgICBmb3IgcG9ydF9udW1iZXIgaW4g c2VsZi5IVFRQX1BPUlRTOgpAQCAtMjE0LDcgKzIxNCw3IEBAIGNsYXNzIFBvcnRUZXN0Q2FzZSh1 bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICBwb3J0LnN0b3BfaHR0cF9zZXJ2ZXIoKQog CiAgICAgQHhmYWlsCi0gICAgZGVmIGludGVncmF0aW9uX3Rlc3RfaHR0cF9zZXJ2ZXJfX3R3b19z ZXJ2ZXJzKHNlbGYpOgorICAgIGRlZiBzZXJpYWxfaW50ZWdyYXRpb25fdGVzdF9odHRwX3NlcnZl cl9fdHdvX3NlcnZlcnMoc2VsZik6CiAgICAgICAgICMgVGVzdCB0aGF0IGNhbGxpbmcgc3RhcnQo KSBvbiB0d28gZGlmZmVyZW50IHBvcnRzIGNhdXNlcyB0aGUKICAgICAgICAgIyBmaXJzdCBwb3J0 IHRvIGJlIHRyZWF0ZWQgYXMgc3RhbGUgYW5kIGtpbGxlZC4KICAgICAgICAgcG9ydCA9IHNlbGYu bWFrZV9wb3J0KCkKQEAgLTM1MSw3ICszNTEsNyBAQCBjbGFzcyBQb3J0VGVzdENhc2UodW5pdHRl c3QuVGVzdENhc2UpOgogCiAgICAgQHNsb3cKICAgICBAeGZhaWwKLSAgICBkZWYgaW50ZWdyYXRp b25fdGVzdF93ZWJzb2NrZXRfc2VydmVyX19ub3JtYWwoc2VsZik6CisgICAgZGVmIHNlcmlhbF9p bnRlZ3JhdGlvbl90ZXN0X3dlYnNvY2tldF9zZXJ2ZXJfX25vcm1hbChzZWxmKToKICAgICAgICAg cG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKICAgICAgICAgc2VsZi5hc3NlcnRfc2VydmVyc19hcmVf ZG93bignbG9jYWxob3N0Jywgc2VsZi5XRUJTT0NLRVRfUE9SVFMpCiAgICAgICAgIHBvcnQuc3Rh cnRfd2Vic29ja2V0X3NlcnZlcigpCkBAIC0zNjAsNyArMzYwLDcgQEAgY2xhc3MgUG9ydFRlc3RD YXNlKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRfc2VydmVyc19hcmVf ZG93bignbG9jYWxob3N0Jywgc2VsZi5XRUJTT0NLRVRfUE9SVFMpCiAKICAgICBAeGZhaWwKLSAg ICBkZWYgaW50ZWdyYXRpb25fdGVzdF93ZWJzb2NrZXRfc2VydmVyX19mYWlscyhzZWxmKToKKyAg ICBkZWYgc2VyaWFsX2ludGVncmF0aW9uX3Rlc3Rfd2Vic29ja2V0X3NlcnZlcl9fZmFpbHMoc2Vs Zik6CiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCiAKICAgICAgICAgIyBUZXN0IHRo YXQgc3RhcnQoKSBmYWlscyBpZiBhIHBvcnQgaXNuJ3QgYXZhaWxhYmxlLgpAQCAtMzg1LDcgKzM4 NSw3IEBAIGNsYXNzIFBvcnRUZXN0Q2FzZSh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAg ICBwb3J0LnN0b3Bfd2Vic29ja2V0X3NlcnZlcigpCiAKICAgICBAeGZhaWwKLSAgICBkZWYgaW50 ZWdyYXRpb25fdGVzdF93ZWJzb2NrZXRfc2VydmVyX190d29fc2VydmVycyhzZWxmKToKKyAgICBk ZWYgc2VyaWFsX2ludGVncmF0aW9uX3Rlc3Rfd2Vic29ja2V0X3NlcnZlcl9fdHdvX3NlcnZlcnMo c2VsZik6CiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCiAKICAgICAgICAgIyBUZXN0 IHRoYXQgY2FsbGluZyBzdGFydCgpIG9uIHR3byBkaWZmZXJlbnQgcG9ydHMgY2F1c2VzIHRoZQpA QCAtNDIwLDcgKzQyMCw3IEBAIGNsYXNzIFBvcnRUZXN0Q2FzZSh1bml0dGVzdC5UZXN0Q2FzZSk6 CiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0LnRlc3RfY29uZmlndXJhdGlvbigpIGluIHBv cnQuYWxsX3Rlc3RfY29uZmlndXJhdGlvbnMoKSwgIiVzIG5vdCBpbiAlcyIgJSAocG9ydC50ZXN0 X2NvbmZpZ3VyYXRpb24oKSwgcG9ydC5hbGxfdGVzdF9jb25maWd1cmF0aW9ucygpKSkKIAogICAg IEB4ZmFpbAotICAgIGRlZiBpbnRlZ3JhdGlvbl90ZXN0X2h0dHBfc2VydmVyX19sb29wKHNlbGYp OgorICAgIGRlZiBzZXJpYWxfaW50ZWdyYXRpb25fdGVzdF9odHRwX3NlcnZlcl9fbG9vcChzZWxm KToKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKIAogICAgICAgICBpID0gMApkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9tYWluX3VuaXR0ZXN0LnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9tYWluX3VuaXR0ZXN0LnB5CmluZGV4IDBiODMx NDg1ZjY0MmZjODJhMWVhNjU3ZmRhYWIxYjliZTQyMTc5YjkuLjgwMjI4ZTJjZGE1OTM1OTY0NzE3 MjJhNDZkNjQ1NzBlZDAxYmJlNjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv c3R5bGUvbWFpbl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L21haW5fdW5pdHRlc3QucHkKQEAgLTMzLDYgKzMzLDcgQEAgZnJvbSB3ZWJraXRweS5jb21tb24u c3lzdGVtLmxvZ3Rlc3RpbmcgaW1wb3J0IExvZ1Rlc3RpbmcKIGZyb20gd2Via2l0cHkuc3R5bGUu Y2hlY2tlciBpbXBvcnQgU3R5bGVQcm9jZXNzb3IKIGZyb20gd2Via2l0cHkuc3R5bGUuZmlsZXJl YWRlciBpbXBvcnQgVGV4dEZpbGVSZWFkZXIKIGZyb20gd2Via2l0cHkuc3R5bGUubWFpbiBpbXBv cnQgY2hhbmdlX2RpcmVjdG9yeQorZnJvbSB3ZWJraXRweS50ZXN0Lm1hcmtlcnMgaW1wb3J0IHNs b3cKIAogZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IE91dHB1dENhcHR1cmUKIApAQCAtMTE1LDYg KzExNiw3IEBAIGNsYXNzIEV4cGVjdGF0aW9uTGludGVySW5TdHlsZUNoZWNrZXJUZXN0KHVuaXR0 ZXN0LlRlc3RDYXNlKToKICAgICAgICAgaG9zdC5maWxlc3lzdGVtID0gTW9ja0ZpbGVTeXN0ZW0o ZmlsZXM9ZXhwZWN0YXRpb25fZmlsZXMpCiAgICAgICAgIHJldHVybiBob3N0CiAKKyAgICBAc2xv dwogICAgIGRlZiB0ZXN0X25vX2xpbnRlcl9lcnJvcnMoc2VsZik6CiAgICAgICAgIGhvc3QgPSBz ZWxmLl9nZW5lcmF0ZV90ZXN0aW5nX2hvc3QoKQogCkBAIC0xMjUsNiArMTI3LDcgQEAgY2xhc3Mg RXhwZWN0YXRpb25MaW50ZXJJblN0eWxlQ2hlY2tlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgog ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNhcHR1cmVkLnN0ZGVyci5nZXR2YWx1ZSgpLCAnJykK ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjYXB0dXJlZC5yb290LmxvZy5nZXR2YWx1ZSgpLCAn JykKIAorICAgIEBzbG93CiAgICAgZGVmIHRlc3RfbGludGVyX2R1cGxpY2F0ZV9saW5lKHNlbGYp OgogICAgICAgICBmaWxlcyA9IHsKICAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRU ZXN0cy9UZXN0RXhwZWN0YXRpb25zJzoKQEAgLTE0OSw2ICsxNTIsNyBAQCBjbGFzcyBFeHBlY3Rh dGlvbkxpbnRlckluU3R5bGVDaGVja2VyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAg ICAgICAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9uczozOiAgRHVw bGljYXRlIG9yIGFtYmlndW91cyBlbnRyeSBsaW5lcyBMYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp b25zOjIgYW5kIExheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnM6My4gIFt0ZXN0L2V4cGVjdGF0 aW9uc10gWzVdXG4nLAogICAgICAgICApCiAKKyAgICBAc2xvdwogICAgIGRlZiB0ZXN0X2xpbnRl cl9kdXBsaWNhdGVfbGluZV9ub19lZGl0KHNlbGYpOgogICAgICAgICBmaWxlcyA9IHsKICAgICAg ICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zJzoKQEAg LTE2Myw2ICsxNjcsNyBAQCBjbGFzcyBFeHBlY3RhdGlvbkxpbnRlckluU3R5bGVDaGVja2VyVGVz dCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY2FwdHVyZWQu c3RkZXJyLmdldHZhbHVlKCksICcnKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNhcHR1cmVk LnJvb3QubG9nLmdldHZhbHVlKCksICcnKQogCisgICAgQHNsb3cKICAgICBkZWYgdGVzdF9saW50 ZXJfZHVwbGljYXRlX2xpbmVfZWRpdF9pbl9maWxlKHNlbGYpOgogICAgICAgICBmaWxlcyA9IHsK ICAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25z JzoKQEAgLTE3Nyw2ICsxODIsNyBAQCBjbGFzcyBFeHBlY3RhdGlvbkxpbnRlckluU3R5bGVDaGVj a2VyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY2Fw dHVyZWQuc3RkZXJyLmdldHZhbHVlKCksICcnKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNh cHR1cmVkLnJvb3QubG9nLmdldHZhbHVlKCksICcnKQogCisgICAgQHNsb3cKICAgICBkZWYgdGVz dF9saW50ZXJfZHVwbGljYXRlX2xpbmVfb25seV9kZWxldGVzKHNlbGYpOgogICAgICAgICBmaWxl cyA9IHsKICAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0 YXRpb25zJzoKQEAgLTE5MSw2ICsxOTcsNyBAQCBjbGFzcyBFeHBlY3RhdGlvbkxpbnRlckluU3R5 bGVDaGVja2VyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoY2FwdHVyZWQuc3RkZXJyLmdldHZhbHVlKCksICcnKQogICAgICAgICBzZWxmLmFzc2VydEVx dWFsKGNhcHR1cmVkLnJvb3QubG9nLmdldHZhbHVlKCksICcnKQogCisgICAgQHNsb3cKICAgICBk ZWYgdGVzdF9saW50ZXJfYWRkZWRfZmlsZV93aXRoX2Vycm9yKHNlbGYpOgogICAgICAgICBmaWxl cyA9IHsKICAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0 YXRpb25zJzoKQEAgLTIwOCw2ICsyMTUsNyBAQCBjbGFzcyBFeHBlY3RhdGlvbkxpbnRlckluU3R5 bGVDaGVja2VyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICAnL21vY2stY2hl Y2tvdXQvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9uczozOiAgRHVwbGljYXRlIG9yIGFtYmln dW91cyBlbnRyeSBsaW5lcyBMYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zOjIgYW5kIExheW91 dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnM6My4gIFt0ZXN0L2V4cGVjdGF0aW9uc10gWzVdXG4nLAog ICAgICAgICApCiAKKyAgICBAc2xvdwogICAgIGRlZiB0ZXN0X2xpbnRlcl9kZWxldGVkX2ZpbGUo c2VsZik6CiAgICAgICAgIGZpbGVzID0gewogICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xh eW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMnOgpAQCAtMjI1LDYgKzIzMyw3IEBAIGNsYXNzIEV4 cGVjdGF0aW9uTGludGVySW5TdHlsZUNoZWNrZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zOjI6 ICBQYXRoIGRvZXMgbm90IGV4aXN0LiAgW3Rlc3QvZXhwZWN0YXRpb25zXSBbNV1cbicsCiAgICAg ICAgICkKIAorICAgIEBzbG93CiAgICAgZGVmIHRlc3RfbGludGVyX2RlbGV0ZWRfZmlsZV9ub19l ZGl0KHNlbGYpOgogICAgICAgICBmaWxlcyA9IHsKICAgICAgICAgICAgICcvbW9jay1jaGVja291 dC9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zJzoKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdGVzdC9tYWluX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90ZXN0L21haW5fdW5pdHRlc3QucHkKaW5kZXggN2QxNGU5OWI4MWI4MjVhZGRmODY4N2M5MmFl NmNlMWRhOTdiZjJlNy4uYmFmYTYwZGVlNjA2MDAwZGIyMjQ5MzE0OTM5NWZkZTkyZDBlMmM2ZiAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW5fdW5pdHRlc3QucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW5fdW5pdHRlc3QucHkKQEAgLTMw LDcgKzMwLDcgQEAgZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IFN0cmluZ0lPCiBmcm9tIHdlYmtp dHB5LmNvbW1vbi5zeXN0ZW0uZmlsZXN5c3RlbSBpbXBvcnQgRmlsZVN5c3RlbQogZnJvbSB3ZWJr aXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQgRXhlY3V0aXZlCiBmcm9tIHdlYmtp dHB5LnRlc3QubWFpbiBpbXBvcnQgVGVzdGVyLCBfTG9hZGVyCi1mcm9tIHdlYmtpdHB5LnRlc3Qu bWFya2VycyBpbXBvcnQgeGZhaWwKK2Zyb20gd2Via2l0cHkudGVzdC5tYXJrZXJzIGltcG9ydCBz bG93LCB4ZmFpbAogCiBmcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQgT3V0cHV0Q2FwdHVyZQogCkBA IC0xMDgsNiArMTA4LDcgQEAgY2xhc3MgVGVzdGVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAg ICAgICAgICAgICBTVFVCU19DTEFTUyArICcuc2VyaWFsX3Rlc3RfZW1wdHknLAogICAgICAgICAg ICAgXSkKIAorICAgIEBzbG93CiAgICAgQHhmYWlsCiAgICAgZGVmIGludGVncmF0aW9uX3Rlc3Rf Y292ZXJhZ2Vfd29ya3Moc2VsZik6CiAgICAgICAgIGZpbGVzeXN0ZW0gPSBGaWxlU3lzdGVtKCkK