76084 2012-01-11 11:47:10 -0800 webkitpy: webkitpy.layout_tests.port tests should only use MockSystemHost, not MockHost 2012-01-11 13:36:34 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 75037 1 dpranke dpranke abarth eric ojan webkit.review.bot oldest_to_newest 534075 0 dpranke 2012-01-11 11:47:10 -0800 webkitpy: webkitpy.layout_tests.port tests should only use MockSystemHost, not MockHost 534077 1 122060 dpranke 2012-01-11 11:48:16 -0800 Created attachment 122060 Patch 534080 2 122060 dpranke 2012-01-11 11:49:02 -0800 Comment on attachment 122060 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=122060&action=review > Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py:-398 > -class DriverTest(unittest.TestCase): Note this class was moved to driver_unittest.py but I forget to delete it here. Deleting now. 534211 3 dpranke 2012-01-11 13:36:34 -0800 Committed r104739: <http://trac.webkit.org/changeset/104739> 122060 2012-01-11 11:48:16 -0800 2012-01-11 13:20:31 -0800 Patch bug-76084-20120111114814.patch text/plain 23572 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NzI1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTc4NzFhZWQ4OGE4YjRhNjQyNDRiODYwZGVkNWI4ZGYy NGVjZjUzYy4uNzU0ZDMzZjJmNWFjNTgzMDg5MjNlMmY1YzljZjA4OTAyNmM4ZDM0OSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDU4 IEBACiAyMDEyLTAxLTExICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHdlYmtpdHB5OiB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydCB0ZXN0cyBzaG91bGQg b25seSB1c2UgTW9ja1N5c3RlbUhvc3QsIG5vdCBNb2NrSG9zdAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzYwODQKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHdpbGwgaGVscCBtYWtlIGl0IGVhc2ll ciB0byBjYXRjaCBsYXllcmluZyB2aW9sYXRpb25zLiBUaGlzCisgICAgICAgIGNoYW5nZSBqdXN0 IHJlZmFjdG9ycyB0ZXN0IGNvZGU7IHRoZXJlIGFyZSBubyBjaGFuZ2VzIHRvCisgICAgICAgIHBy b2R1Y3Rpb24gY29kZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvYmFzZV91bml0dGVzdC5weToKKyAgICAgICAgKFBvcnRUZXN0Lm1ha2VfcG9ydCk6Cisg ICAgICAgIChQb3J0VGVzdC50ZXN0X2ZpbmRfbm9fcGF0aHNfc3BlY2lmaWVkKToKKyAgICAgICAg KFBvcnRUZXN0LnRlc3RfZmluZF9vbmVfdGVzdCk6CisgICAgICAgIChQb3J0VGVzdC50ZXN0X2Zp bmRfZ2xvYik6CisgICAgICAgIChQb3J0VGVzdC50ZXN0X2ZpbmRfd2l0aF9za2lwcGVkX2RpcmVj dG9yaWVzKToKKyAgICAgICAgKFBvcnRUZXN0LnRlc3RfZmluZF93aXRoX3NraXBwZWRfZGlyZWN0 b3JpZXNfMik6CisgICAgICAgIChQb3J0VGVzdC50ZXN0X3BhcnNlX3JlZnRlc3RfbGlzdCk6Cisg ICAgICAgIChQb3J0VGVzdC50ZXN0X2h0dHBkX3JldHVybnNfZXJyb3JfY29kZSk6CisgICAgICAg IChQb3J0VGVzdC50ZXN0X3ZpcnR1YWxfbWV0aG9kcyk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9ncHVfdW5pdHRlc3QucHk6CisgICAgICAg IChDaHJvbWl1bUdwdVRlc3QuYXNzZXJ0X3BvcnRfd29ya3MpOgorICAgICAgICAoQ2hyb21pdW1H cHVUZXN0Ll9hc3NlcnRfYmFzZWxpbmVfcGF0aCk6CisgICAgICAgIChDaHJvbWl1bUdwdVRlc3Qu dGVzdF9ncmFwaGljc190eXBlKToKKyAgICAgICAgKENocm9taXVtR3B1VGVzdC50ZXN0X2RlZmF1 bHRfdGVzdHNfcGF0aHMudGVzdF9wYXRocyk6CisgICAgICAgIChDaHJvbWl1bUdwdVRlc3QudGVz dF90ZXN0X2ZpbGVzKToKKyAgICAgICAgKENocm9taXVtR3B1VGVzdC50ZXN0X3Rlc3RfZmlsZXMu dGVzdF9wYXRocyk6CisgICAgICAgIChDaHJvbWl1bUdwdVRlc3QpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXhfdW5pdHRlc3QucHk6 CisgICAgICAgIChDaHJvbWl1bUxpbnV4UG9ydFRlc3QuYXNzZXJ0X2FyY2hpdGVjdHVyZSk6Cisg ICAgICAgIChDaHJvbWl1bUxpbnV4UG9ydFRlc3QudGVzdF9jaGVja19pbGxlZ2FsX3BvcnRfbmFt ZXMpOgorICAgICAgICAoQ2hyb21pdW1MaW51eFBvcnRUZXN0LnRlc3RfZGV0ZXJtaW5lX2FyY2hp dGVjdHVyZV9mYWlscyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9kcml2ZXJfdW5pdHRlc3QucHk6CisgICAgICAgIChEcml2ZXJUZXN0Lm1ha2VfcG9ydCk6 CisgICAgICAgIChEcml2ZXJUZXN0KToKKyAgICAgICAgKERyaXZlclRlc3QuYXNzZXJ0VmlydHVh bCk6CisgICAgICAgIChEcml2ZXJUZXN0Ll9hc3NlcnRfd3JhcHBlcik6CisgICAgICAgIChEcml2 ZXJUZXN0LnRlc3RfdmlydHVhbF9kcml2ZXJfbWV0aG9kcyk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tb2NrX2RydF91bml0dGVzdC5weToKKyAgICAgICAg KE1vY2tEUlRQb3J0VGVzdC5tYWtlX3BvcnQpOgorICAgICAgICAoTW9ja0RSVFBvcnRUZXN0LnRl c3RfcG9ydF9uYW1lX2luX2NvbnN0cnVjdG9yKToKKyAgICAgICAgKE1vY2tEUlRUZXN0LmFzc2Vy dFRlc3QpOgorICAgICAgICAoTW9ja0RSVFRlc3QudGVzdF9tYWluKToKKyAgICAgICAgKE1vY2tD aHJvbWl1bURSVFRlc3QudGVzdF9waXhlbHRlc3RfX2ZhaWxzKToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5OgorICAgICAgICAoUXRQ b3J0VGVzdC5fYXNzZXJ0X3NlYXJjaF9wYXRoKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdF91bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RXZWJL aXRQb3J0Ll9faW5pdF9fKToKKyAgICAgICAgKFdlYktpdFBvcnRVbml0VGVzdHMudGVzdF9kZWZh dWx0X29wdGlvbnMpOgorICAgICAgICAodGVzdF9ydW50aW1lX2ZlYXR1cmVfbGlzdCk6CisgICAg ICAgICh0ZXN0X3Rlc3RfZXhwZWN0YXRpb25zKToKKworMjAxMi0wMS0xMSAgRGlyayBQcmFua2Ug IDxkcHJhbmtlQGNocm9taXVtLm9yZz4KKwogICAgICAgICB3ZWJraXRweTogY2xlYW4gdXAgdmVy c2lvbiBkZXRlY3Rpb24gaW4gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2MDE2CiAKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZV91bml0dGVzdC5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZV91bml0dGVz dC5weQppbmRleCA0NzFmNDA5YTQyZThhYjNmNWViYTQ2ZjdiZDgxYjU4YTU2ZGIzOWJkLi41MjVk ODNhZjhhMDk0MmJmNmVjNTQzMjNkNTRlNjY4OTMyYjZiODg4IDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2VfdW5pdHRlc3QucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5 CkBAIC00MCwxOSArNDAsMjIgQEAgZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLnBhdGggaW1w b3J0IGFic3BhdGhfdG9fdXJpCiBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkubW9jayBpbXBvcnQg TW9jawogZnJvbSB3ZWJraXRweS50b29sLm1vY2t0b29sIGltcG9ydCBNb2NrT3B0aW9ucwogZnJv bSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZV9tb2NrIGltcG9ydCBNb2NrRXhlY3V0 aXZlLCBNb2NrRXhlY3V0aXZlMgotZnJvbSB3ZWJraXRweS5jb21tb24uaG9zdF9tb2NrIGltcG9y dCBNb2NrSG9zdAorZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLnN5c3RlbWhvc3RfbW9jayBp bXBvcnQgTW9ja1N5c3RlbUhvc3QKIAogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydCBp bXBvcnQgUG9ydCwgRHJpdmVyLCBEcml2ZXJPdXRwdXQKLWZyb20gd2Via2l0cHkubGF5b3V0X3Rl c3RzLnBvcnQudGVzdCBpbXBvcnQgVGVzdFBvcnQKK2Zyb20gd2Via2l0cHkubGF5b3V0X3Rlc3Rz LnBvcnQudGVzdCBpbXBvcnQgYWRkX3VuaXRfdGVzdHNfdG9fbW9ja19maWxlc3lzdGVtLCBUZXN0 UG9ydAogCiBpbXBvcnQgY29uZmlnCiBpbXBvcnQgY29uZmlnX21vY2sKIAogY2xhc3MgUG9ydFRl c3QodW5pdHRlc3QuVGVzdENhc2UpOgotICAgIGRlZiBtYWtlX3BvcnQoc2VsZiwgZXhlY3V0aXZl PU5vbmUsICoqa3dhcmdzKToKLSAgICAgICAgaG9zdCA9IE1vY2tIb3N0KCkKKyAgICBkZWYgbWFr ZV9wb3J0KHNlbGYsIGV4ZWN1dGl2ZT1Ob25lLCB3aXRoX3Rlc3RzPUZhbHNlLCAqKmt3YXJncyk6 CisgICAgICAgIGhvc3QgPSBNb2NrU3lzdGVtSG9zdCgpCiAgICAgICAgIGlmIGV4ZWN1dGl2ZToK ICAgICAgICAgICAgIGhvc3QuZXhlY3V0aXZlID0gZXhlY3V0aXZlCisgICAgICAgIGlmIHdpdGhf dGVzdHM6CisgICAgICAgICAgICBhZGRfdW5pdF90ZXN0c190b19tb2NrX2ZpbGVzeXN0ZW0oaG9z dC5maWxlc3lzdGVtKQorICAgICAgICAgICAgcmV0dXJuIFRlc3RQb3J0KGhvc3QsICoqa3dhcmdz KQogICAgICAgICByZXR1cm4gUG9ydChob3N0LCAqKmt3YXJncykKIAogICAgIGRlZiB0ZXN0X2Rl ZmF1bHRfY2hpbGRfcHJvY2Vzc2VzKHNlbGYpOgpAQCAtMjg0LDI4ICsyODcsMjggQEAgY2xhc3Mg UG9ydFRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydFRydWUocG9y dC51c2VzX3Rlc3RfZXhwZWN0YXRpb25zX2ZpbGUoKSkKIAogICAgIGRlZiB0ZXN0X2ZpbmRfbm9f cGF0aHNfc3BlY2lmaWVkKHNlbGYpOgotICAgICAgICBwb3J0ID0gVGVzdFBvcnQoTW9ja0hvc3Qo KSkKKyAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KHdpdGhfdGVzdHM9VHJ1ZSkKICAgICAg ICAgbGF5b3V0X3Rlc3RzX2RpciA9IHBvcnQubGF5b3V0X3Rlc3RzX2RpcigpCiAgICAgICAgIHRl c3RzID0gcG9ydC50ZXN0cyhbXSkKICAgICAgICAgc2VsZi5hc3NlcnROb3RFcXVhbChsZW4odGVz dHMpLCAwKQogCiAgICAgZGVmIHRlc3RfZmluZF9vbmVfdGVzdChzZWxmKToKLSAgICAgICAgcG9y dCA9IFRlc3RQb3J0KE1vY2tIb3N0KCkpCisgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCh3 aXRoX3Rlc3RzPVRydWUpCiAgICAgICAgIHRlc3RzID0gcG9ydC50ZXN0cyhbJ2ZhaWx1cmVzL2V4 cGVjdGVkL2ltYWdlLmh0bWwnXSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsZW4odGVzdHMp LCAxKQogCiAgICAgZGVmIHRlc3RfZmluZF9nbG9iKHNlbGYpOgotICAgICAgICBwb3J0ID0gVGVz dFBvcnQoTW9ja0hvc3QoKSkKKyAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KHdpdGhfdGVz dHM9VHJ1ZSkKICAgICAgICAgdGVzdHMgPSBwb3J0LnRlc3RzKFsnZmFpbHVyZXMvZXhwZWN0ZWQv aW0qJ10pCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobGVuKHRlc3RzKSwgMikKIAogICAgIGRl ZiB0ZXN0X2ZpbmRfd2l0aF9za2lwcGVkX2RpcmVjdG9yaWVzKHNlbGYpOgotICAgICAgICBwb3J0 ID0gVGVzdFBvcnQoTW9ja0hvc3QoKSkKKyAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KHdp dGhfdGVzdHM9VHJ1ZSkKICAgICAgICAgdGVzdHMgPSBwb3J0LnRlc3RzKCd1c2Vyc2NyaXB0cycp CiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgndXNlcnNjcmlwdHMvcmVzb3VyY2VzL2lmcmFtZS5o dG1sJyBub3QgaW4gdGVzdHMpCiAKICAgICBkZWYgdGVzdF9maW5kX3dpdGhfc2tpcHBlZF9kaXJl Y3Rvcmllc18yKHNlbGYpOgotICAgICAgICBwb3J0ID0gVGVzdFBvcnQoTW9ja0hvc3QoKSkKKyAg ICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KHdpdGhfdGVzdHM9VHJ1ZSkKICAgICAgICAgdGVz dHMgPSBwb3J0LnRlc3RzKFsndXNlcnNjcmlwdHMvcmVzb3VyY2VzJ10pCiAgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwodGVzdHMsIHNldChbXSkpCiAKQEAgLTMyNSw3ICszMjgsNyBAQCBjbGFzcyBQ b3J0VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoUG9y dC5faXNfdGVzdF9maWxlKGZpbGVzeXN0ZW0sICcnLCAnbm90cmVmLWZvby54aHInKSkKIAogICAg IGRlZiB0ZXN0X3BhcnNlX3JlZnRlc3RfbGlzdChzZWxmKToKLSAgICAgICAgcG9ydCA9IFRlc3RQ b3J0KE1vY2tIb3N0KCkpCisgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCh3aXRoX3Rlc3Rz PVRydWUpCiAgICAgICAgIHBvcnQuaG9zdC5maWxlc3lzdGVtLmZpbGVzWydiYXIvcmVmdGVzdC5s aXN0J10gPSAiXG4iLmpvaW4oWyI9PSB0ZXN0Lmh0bWwgdGVzdC1yZWYuaHRtbCIsCiAgICAgICAg ICIiLAogICAgICAgICAiIyBzb21lIGNvbW1lbnQiLApAQCAtMzYwLDE0ICszNjMsMTEgQEAgY2xh c3MgUG9ydFRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBfLCBfLCBsb2dzID0gY2Fw dHVyZS5yZXN0b3JlX291dHB1dCgpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ2h0dHBkIHNl ZW1zIGJyb2tlbi4gQ2Fubm90IHJ1biBodHRwIHRlc3RzLlxuJywgbG9ncykKIAotCi1jbGFzcyBW aXJ0dWFsVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6Ci0gICAgIiIiVGVzdHMgdGhhdCB2YXJpb3Vz IG1ldGhvZHMgZXhwZWN0ZWQgdG8gYmUgdmlydHVhbCBhcmUuIiIiCiAgICAgZGVmIGFzc2VydFZp cnR1YWwoc2VsZiwgbWV0aG9kLCAqYXJncywgKiprd2FyZ3MpOgogICAgICAgICBzZWxmLmFzc2Vy dFJhaXNlcyhOb3RJbXBsZW1lbnRlZEVycm9yLCBtZXRob2QsICphcmdzLCAqKmt3YXJncykKIAog ICAgIGRlZiB0ZXN0X3ZpcnR1YWxfbWV0aG9kcyhzZWxmKToKLSAgICAgICAgcG9ydCA9IFBvcnQo TW9ja0hvc3QoKSkKKyAgICAgICAgcG9ydCA9IFBvcnQoTW9ja1N5c3RlbUhvc3QoKSkKICAgICAg ICAgc2VsZi5hc3NlcnRWaXJ0dWFsKHBvcnQuYmFzZWxpbmVfcGF0aCkKICAgICAgICAgc2VsZi5h c3NlcnRWaXJ0dWFsKHBvcnQuYmFzZWxpbmVfc2VhcmNoX3BhdGgpCiAgICAgICAgIHNlbGYuYXNz ZXJ0VmlydHVhbChwb3J0LmNoZWNrX2J1aWxkLCBOb25lKQpAQCAtMzg3LDI5ICszODcsNiBAQCBj bGFzcyBWaXJ0dWFsVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0 VmlydHVhbChwb3J0Ll9wYXRoX3RvX2xpZ2h0dHBkX3BocCkKICAgICAgICAgc2VsZi5hc3NlcnRW aXJ0dWFsKHBvcnQuX3BhdGhfdG9fd2RpZmYpCiAKLSAgICBkZWYgdGVzdF92aXJ0dWFsX2RyaXZl cl9tZXRob2RzKHNlbGYpOgotICAgICAgICBkcml2ZXIgPSBEcml2ZXIoUG9ydChNb2NrSG9zdCgp KSwgTm9uZSwgcGl4ZWxfdGVzdHM9RmFsc2UpCi0gICAgICAgIHNlbGYuYXNzZXJ0VmlydHVhbChk cml2ZXIucnVuX3Rlc3QsIE5vbmUpCi0gICAgICAgIHNlbGYuYXNzZXJ0VmlydHVhbChkcml2ZXIu c3RvcCkKLSAgICAgICAgc2VsZi5hc3NlcnRWaXJ0dWFsKGRyaXZlci5jbWRfbGluZSkKLQotCi0j IEZJWE1FOiBUaGlzIHNob3VsZCBiZSBtb3ZlZCB0byBkcml2ZXJfdW5pdHRlc3QucHkgb3IganVz dCBkZWxldGVkLgotY2xhc3MgRHJpdmVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6Ci0KLSAgICBk ZWYgX2Fzc2VydF93cmFwcGVyKHNlbGYsIHdyYXBwZXJfc3RyaW5nLCBleHBlY3RlZF93cmFwcGVy KToKLSAgICAgICAgd3JhcHBlciA9IERyaXZlcihQb3J0KE1vY2tIb3N0KCkpLCBOb25lLCBwaXhl bF90ZXN0cz1GYWxzZSkuX2NvbW1hbmRfd3JhcHBlcih3cmFwcGVyX3N0cmluZykKLSAgICAgICAg c2VsZi5hc3NlcnRFcXVhbCh3cmFwcGVyLCBleHBlY3RlZF93cmFwcGVyKQotCi0gICAgZGVmIHRl c3RfY29tbWFuZF93cmFwcGVyKHNlbGYpOgotICAgICAgICBzZWxmLl9hc3NlcnRfd3JhcHBlcihO b25lLCBbXSkKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3dyYXBwZXIoInZhbGdyaW5kIiwgWyJ2YWxn cmluZCJdKQotCi0gICAgICAgICMgVmFsaWRhdGUgdGhhdCBzaGxleCB3b3JrcyBhcyBleHBlY3Rl ZC4KLSAgICAgICAgY29tbWFuZF93aXRoX3NwYWNlcyA9ICJ2YWxncmluZCAtLXNtYy1jaGVjaz1c ImNoZWNrIHdpdGggc3BhY2VzIVwiIC0tZm9vIgotICAgICAgICBleHBlY3RlZF9wYXJzZSA9IFsi dmFsZ3JpbmQiLCAiLS1zbWMtY2hlY2s9Y2hlY2sgd2l0aCBzcGFjZXMhIiwgIi0tZm9vIl0KLSAg ICAgICAgc2VsZi5fYXNzZXJ0X3dyYXBwZXIoY29tbWFuZF93aXRoX3NwYWNlcywgZXhwZWN0ZWRf cGFyc2UpCi0KIAogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICB1bml0dGVzdC5tYWlu KCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv Y2hyb21pdW1fZ3B1X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9jaHJvbWl1bV9ncHVfdW5pdHRlc3QucHkKaW5kZXggNzJhZDE4MWEyOTliMjNj Yzc5NDQxODhhNTg1ZmRhMGMzNDllNjUzMy4uYzk2YjdlYjE4MWI3N2ZlNDJkMDM3NjUwOTcyZjRm OWUyZDE2ZmE4ZCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9jaHJvbWl1bV9ncHVfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9ncHVfdW5pdHRlc3QucHkKQEAgLTI3LDgg KzI3LDggQEAKIGltcG9ydCBzeXMKIGltcG9ydCB1bml0dGVzdAogCi1mcm9tIHdlYmtpdHB5LmNv bW1vbi5ob3N0X21vY2sgaW1wb3J0IE1vY2tIb3N0CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0 ZW0uZmlsZXN5c3RlbV9tb2NrIGltcG9ydCBNb2NrRmlsZVN5c3RlbQorZnJvbSB3ZWJraXRweS5j b21tb24uc3lzdGVtLnN5c3RlbWhvc3RfbW9jayBpbXBvcnQgTW9ja1N5c3RlbUhvc3QKIGZyb20g d2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IGNocm9taXVtX2dwdQogZnJvbSB3ZWJr aXRweS5sYXlvdXRfdGVzdHMucG9ydCBpbXBvcnQgcG9ydF90ZXN0Y2FzZQogZnJvbSB3ZWJraXRw eS5sYXlvdXRfdGVzdHMucG9ydC5mYWN0b3J5IGltcG9ydCBQb3J0RmFjdG9yeQpAQCAtNTEsNyAr NTEsNyBAQCBjbGFzcyBDaHJvbWl1bUdwdVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAg ICBzZWxmLmFzc2VydF9wb3J0X3dvcmtzKCdjaHJvbWl1bS1ncHUtd2luJywgJ2Nocm9taXVtLWdw dScsICdjeWd3aW4nKQogCiAgICAgZGVmIGFzc2VydF9wb3J0X3dvcmtzKHNlbGYsIHBvcnRfbmFt ZSwgaW5wdXRfbmFtZT1Ob25lLCBwbGF0Zm9ybT1Ob25lKToKLSAgICAgICAgaG9zdCA9IE1vY2tI b3N0KCkKKyAgICAgICAgaG9zdCA9IE1vY2tTeXN0ZW1Ib3N0KCkKICAgICAgICAgaG9zdC5maWxl c3lzdGVtID0gRmlsZVN5c3RlbSgpICAjIEZJWE1FOiBUaGlzIHRlc3Qgc2hvdWxkIG5vdCB1c2Ug YSByZWFsIGZpbGVzeXN0ZW0hCiAKICAgICAgICAgIyB0ZXN0IHRoYXQgd2UgZ290IHRoZSByaWdo dCBwb3J0CkBAIC05MSw4ICs5MSw3IEBAIGNsYXNzIENocm9taXVtR3B1VGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UocGF0aCBpbiBmaWxlcykKIAogICAg IGRlZiBfYXNzZXJ0X2Jhc2VsaW5lX3BhdGgoc2VsZiwgcG9ydF9uYW1lLCBiYXNlbGluZV9wYXRo KToKLSAgICAgICAgaG9zdCA9IE1vY2tIb3N0KCkKLSAgICAgICAgcG9ydCA9IGhvc3QucG9ydF9m YWN0b3J5LmdldChwb3J0X25hbWUpCisgICAgICAgIHBvcnQgPSBQb3J0RmFjdG9yeShNb2NrU3lz dGVtSG9zdCgpKS5nZXQocG9ydF9uYW1lKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0 Lm5hbWUoKSwgcG9ydF9uYW1lKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0LmJhc2Vs aW5lX3BhdGgoKSwgcG9ydC5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoYmFzZWxpbmVfcGF0aCkpCiAK QEAgLTEwMiwyMSArMTAxLDE5IEBAIGNsYXNzIENocm9taXVtR3B1VGVzdCh1bml0dGVzdC5UZXN0 Q2FzZSk6CiAgICAgICAgIHNlbGYuX2Fzc2VydF9iYXNlbGluZV9wYXRoKCdjaHJvbWl1bS1ncHUt d2luLXdpbjcnLCAnY2hyb21pdW0tZ3B1LXdpbicpCiAKICAgICBkZWYgdGVzdF9ncmFwaGljc190 eXBlKHNlbGYpOgotICAgICAgICBob3N0ID0gTW9ja0hvc3QoKQotICAgICAgICBwb3J0ID0gaG9z dC5wb3J0X2ZhY3RvcnkuZ2V0KCdjaHJvbWl1bS1ncHUtbWFjJykKKyAgICAgICAgcG9ydCA9IFBv cnRGYWN0b3J5KE1vY2tTeXN0ZW1Ib3N0KCkpLmdldCgnY2hyb21pdW0tZ3B1LW1hYycpCiAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWxzKCdncHUnLCBwb3J0LmdyYXBoaWNzX3R5cGUoKSkKIAogICAg IGRlZiB0ZXN0X2RlZmF1bHRfdGVzdHNfcGF0aHMoc2VsZik6Ci0gICAgICAgIGhvc3QgPSBNb2Nr SG9zdCgpCiAKICAgICAgICAgZGVmIHRlc3RfcGF0aHMocG9ydF9uYW1lKToKLSAgICAgICAgICAg IHJldHVybiBjaHJvbWl1bV9ncHUuX2RlZmF1bHRfdGVzdHNfcGF0aHMoaG9zdC5wb3J0X2ZhY3Rv cnkuZ2V0KHBvcnRfbmFtZSkpCisgICAgICAgICAgICByZXR1cm4gY2hyb21pdW1fZ3B1Ll9kZWZh dWx0X3Rlc3RzX3BhdGhzKFBvcnRGYWN0b3J5KE1vY2tTeXN0ZW1Ib3N0KCkpLmdldChwb3J0X25h bWUpKQogCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwodGVzdF9wYXRocygnY2hyb21pdW0tZ3B1 LWxpbnV4JyksIFsnbWVkaWEnLCAnZmFzdC9jYW52YXMnLCAnY2FudmFzL3BoaWxpcCddKQogICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKHRlc3RfcGF0aHMoJ2Nocm9taXVtLWdwdS1tYWMtbGVvcGFy ZCcpLCBbJ2Zhc3QvY2FudmFzJywgJ2NhbnZhcy9waGlsaXAnXSkKIAogICAgIGRlZiB0ZXN0X3Rl c3RfZmlsZXMoc2VsZik6Ci0gICAgICAgIGhvc3QgPSBNb2NrSG9zdCgpCisgICAgICAgIGhvc3Qg PSBNb2NrU3lzdGVtSG9zdCgpCiAgICAgICAgIGZpbGVzID0gewogICAgICAgICAgICAgJy9tb2Nr LWNoZWNrb3V0L0xheW91dFRlc3RzL2NhbnZhcy9waGlsaXAvdGVzdC5odG1sJzogJycsCiAgICAg ICAgICAgICAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvdGVzdC5odG1s JzogJycsCkBAIC0xMjcsNyArMTI0LDcgQEAgY2xhc3MgQ2hyb21pdW1HcHVUZXN0KHVuaXR0ZXN0 LlRlc3RDYXNlKToKICAgICAgICAgaG9zdC5maWxlc3lzdGVtID0gTW9ja0ZpbGVTeXN0ZW0oZmls ZXMpCiAKICAgICAgICAgZGVmIHRlc3RfcGF0aHMocG9ydF9uYW1lKToKLSAgICAgICAgICAgIHJl dHVybiBob3N0LnBvcnRfZmFjdG9yeS5nZXQocG9ydF9uYW1lKS50ZXN0cyhbXSkKKyAgICAgICAg ICAgIHJldHVybiBQb3J0RmFjdG9yeShob3N0KS5nZXQocG9ydF9uYW1lKS50ZXN0cyhbXSkKIAog ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHRlc3RfcGF0aHMoJ2Nocm9taXVtLWdwdS1saW51eCcp LCBzZXQoWydjYW52YXMvcGhpbGlwL3Rlc3QuaHRtbCcsICdmYXN0L2NhbnZhcy90ZXN0Lmh0bWwn LCAnbWVkaWEvdGVzdC5odG1sJ10pKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHRlc3RfcGF0 aHMoJ2Nocm9taXVtLWdwdS1tYWMtbGVvcGFyZCcpLCBzZXQoWydjYW52YXMvcGhpbGlwL3Rlc3Qu aHRtbCcsICdmYXN0L2NhbnZhcy90ZXN0Lmh0bWwnXSkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4X3VuaXR0ZXN0LnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51 eF91bml0dGVzdC5weQppbmRleCA3OWU2NWNmN2ZjYmJmOTc3N2I4ZTQ4MTJhMDUwNWQ1M2U3ZWI5 ZDRhLi4wYzViZWNiMjNjZGIxNzYyOGYxZDEyMTgxNGM2ZmFhYzA0OTI1Y2U2IDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4 X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvY2hyb21pdW1fbGludXhfdW5pdHRlc3QucHkKQEAgLTI5LDcgKzI5LDcgQEAKIGltcG9ydCB1 bml0dGVzdAogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0gaW1wb3J0IGV4ZWN1dGl2ZV9t b2NrCi1mcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0X21vY2sgaW1wb3J0IE1vY2tIb3N0Citmcm9t IHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uc3lzdGVtaG9zdF9tb2NrIGltcG9ydCBNb2NrU3lzdGVt SG9zdAogCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0IGltcG9ydCBjaHJvbWl1bV9s aW51eAogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydCBpbXBvcnQgcG9ydF90ZXN0Y2Fz ZQpAQCAtMzksNyArMzksNyBAQCBjbGFzcyBDaHJvbWl1bUxpbnV4UG9ydFRlc3QocG9ydF90ZXN0 Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgIHBvcnRfbWFrZXIgPSBjaHJvbWl1bV9saW51eC5DaHJv bWl1bUxpbnV4UG9ydAogCiAgICAgZGVmIGFzc2VydF9hcmNoaXRlY3R1cmUoc2VsZiwgcG9ydF9u YW1lPU5vbmUsIGZpbGVfb3V0cHV0PU5vbmUsIGV4cGVjdGVkX2FyY2hpdGVjdHVyZT1Ob25lKToK LSAgICAgICAgaG9zdCA9IE1vY2tIb3N0KCkKKyAgICAgICAgaG9zdCA9IE1vY2tTeXN0ZW1Ib3N0 KCkKICAgICAgICAgaG9zdC5maWxlc3lzdGVtLmV4aXN0cyA9IGxhbWJkYSB4OiAnRHVtcFJlbmRl clRyZWUnIGluIHgKICAgICAgICAgaWYgZmlsZV9vdXRwdXQ6CiAgICAgICAgICAgICBob3N0LmV4 ZWN1dGl2ZSA9IGV4ZWN1dGl2ZV9tb2NrLk1vY2tFeGVjdXRpdmUyKGZpbGVfb3V0cHV0KQpAQCAt NjcsMTYgKzY3LDE2IEBAIGNsYXNzIENocm9taXVtTGludXhQb3J0VGVzdChwb3J0X3Rlc3RjYXNl LlBvcnRUZXN0Q2FzZSk6CiAgICAgZGVmIHRlc3RfY2hlY2tfaWxsZWdhbF9wb3J0X25hbWVzKHNl bGYpOgogICAgICAgICAjIEZJWE1FOiBDaGVjayB0aGF0LCBmb3Igbm93LCB0aGVzZSBhcmUgaWxs ZWdhbCBwb3J0IG5hbWVzLgogICAgICAgICAjIEV2ZW50dWFsbHkgd2Ugc2hvdWxkIGJlIGFibGUg dG8gZG8gdGhlIHJpZ2h0IHRoaW5nIGhlcmUuCi0gICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKEFz c2VydGlvbkVycm9yLCBjaHJvbWl1bV9saW51eC5DaHJvbWl1bUxpbnV4UG9ydCwgTW9ja0hvc3Qo KSwgcG9ydF9uYW1lPSdjaHJvbWl1bS14ODYtbGludXgnKQotICAgICAgICBzZWxmLmFzc2VydFJh aXNlcyhBc3NlcnRpb25FcnJvciwgY2hyb21pdW1fbGludXguQ2hyb21pdW1MaW51eFBvcnQsIE1v Y2tIb3N0KCksIHBvcnRfbmFtZT0nY2hyb21pdW0tbGludXgteDg2LWdwdScpCisgICAgICAgIHNl bGYuYXNzZXJ0UmFpc2VzKEFzc2VydGlvbkVycm9yLCBjaHJvbWl1bV9saW51eC5DaHJvbWl1bUxp bnV4UG9ydCwgTW9ja1N5c3RlbUhvc3QoKSwgcG9ydF9uYW1lPSdjaHJvbWl1bS14ODYtbGludXgn KQorICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhBc3NlcnRpb25FcnJvciwgY2hyb21pdW1fbGlu dXguQ2hyb21pdW1MaW51eFBvcnQsIE1vY2tTeXN0ZW1Ib3N0KCksIHBvcnRfbmFtZT0nY2hyb21p dW0tbGludXgteDg2LWdwdScpCiAKICAgICBkZWYgdGVzdF9kZXRlcm1pbmVfYXJjaGl0ZWN0dXJl X2ZhaWxzKHNlbGYpOgogICAgICAgICAjIFRlc3QgdGhhdCB3ZSBkZWZhdWx0IHRvICd4ODYnIGlm IHRoZSBkcml2ZXIgZG9lc24ndCBleGlzdC4KLSAgICAgICAgcG9ydCA9IGNocm9taXVtX2xpbnV4 LkNocm9taXVtTGludXhQb3J0KE1vY2tIb3N0KCkpCisgICAgICAgIHBvcnQgPSBjaHJvbWl1bV9s aW51eC5DaHJvbWl1bUxpbnV4UG9ydChNb2NrU3lzdGVtSG9zdCgpKQogICAgICAgICBzZWxmLmFz c2VydEVxdWFscyhwb3J0LmFyY2hpdGVjdHVyZSgpLCAneDg2XzY0JykKIAogICAgICAgICAjIFRl c3QgdGhhdCB3ZSBkZWZhdWx0IHRvICd4ODYnIG9uIGFuIHVua25vd24gYXJjaGl0ZWN0dXJlLgot ICAgICAgICBob3N0ID0gTW9ja0hvc3QoKQorICAgICAgICBob3N0ID0gTW9ja1N5c3RlbUhvc3Qo KQogICAgICAgICBob3N0LmZpbGVzeXN0ZW0uZXhpc3RzID0gbGFtYmRhIHg6IFRydWUKICAgICAg ICAgaG9zdC5leGVjdXRpdmUgPSBleGVjdXRpdmVfbW9jay5Nb2NrRXhlY3V0aXZlMignd2luMzIn KQogICAgICAgICBwb3J0ID0gY2hyb21pdW1fbGludXguQ2hyb21pdW1MaW51eFBvcnQoaG9zdCkK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZHJp dmVyX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9kcml2ZXJfdW5pdHRlc3QucHkKaW5kZXggYWQ4MzU5NjY4YzFkYzBkNDdjZWQxNzMyNWZlZTgy ZGU2ODg1ZGNlYy4uZjJlYzFhYWYwYTQ2NDQxNzMwYThhODI4MTU4NGYxNzVjMTVjMWViZiAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9kcml2ZXJf dW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9kcml2ZXJfdW5pdHRlc3QucHkKQEAgLTMwLDE5ICszMCwyOCBAQCBpbXBvcnQgc3lzCiBpbXBv cnQgdW5pdHRlc3QKIAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLnBhdGggaW1wb3J0IGFi c3BhdGhfdG9fdXJpCi1mcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0X21vY2sgaW1wb3J0IE1vY2tI b3N0Citmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uc3lzdGVtaG9zdF9tb2NrIGltcG9ydCBN b2NrU3lzdGVtSG9zdAogCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0IGltcG9ydCBQ b3J0LCBEcml2ZXIsIERyaXZlck91dHB1dAogCiAKIGNsYXNzIERyaXZlclRlc3QodW5pdHRlc3Qu VGVzdENhc2UpOgogICAgIGRlZiBtYWtlX3BvcnQoc2VsZik6Ci0gICAgICAgIHJldHVybiBQb3J0 KE1vY2tIb3N0KCkpCisgICAgICAgIHJldHVybiBQb3J0KE1vY2tTeXN0ZW1Ib3N0KCkpCisKKyAg ICBkZWYgYXNzZXJ0VmlydHVhbChzZWxmLCBtZXRob2QsICphcmdzLCAqKmt3YXJncyk6CisgICAg ICAgIHNlbGYuYXNzZXJ0UmFpc2VzKE5vdEltcGxlbWVudGVkRXJyb3IsIG1ldGhvZCwgKmFyZ3Ms ICoqa3dhcmdzKQogCiAgICAgZGVmIF9hc3NlcnRfd3JhcHBlcihzZWxmLCB3cmFwcGVyX3N0cmlu ZywgZXhwZWN0ZWRfd3JhcHBlcik6Ci0gICAgICAgIHdyYXBwZXIgPSBEcml2ZXIoUG9ydChNb2Nr SG9zdCgpKSwgTm9uZSwgcGl4ZWxfdGVzdHM9RmFsc2UpLl9jb21tYW5kX3dyYXBwZXIod3JhcHBl cl9zdHJpbmcpCisgICAgICAgIHdyYXBwZXIgPSBEcml2ZXIoc2VsZi5tYWtlX3BvcnQoKSwgTm9u ZSwgcGl4ZWxfdGVzdHM9RmFsc2UpLl9jb21tYW5kX3dyYXBwZXIod3JhcHBlcl9zdHJpbmcpCiAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwod3JhcHBlciwgZXhwZWN0ZWRfd3JhcHBlcikKIAorICAg IGRlZiB0ZXN0X3ZpcnR1YWxfZHJpdmVyX21ldGhvZHMoc2VsZik6CisgICAgICAgIGRyaXZlciA9 IERyaXZlcihzZWxmLm1ha2VfcG9ydCgpLCBOb25lLCBwaXhlbF90ZXN0cz1GYWxzZSkKKyAgICAg ICAgc2VsZi5hc3NlcnRWaXJ0dWFsKGRyaXZlci5ydW5fdGVzdCwgTm9uZSkKKyAgICAgICAgc2Vs Zi5hc3NlcnRWaXJ0dWFsKGRyaXZlci5zdG9wKQorICAgICAgICBzZWxmLmFzc2VydFZpcnR1YWwo ZHJpdmVyLmNtZF9saW5lKQorCiAgICAgZGVmIHRlc3RfY29tbWFuZF93cmFwcGVyKHNlbGYpOgog ICAgICAgICBzZWxmLl9hc3NlcnRfd3JhcHBlcihOb25lLCBbXSkKICAgICAgICAgc2VsZi5fYXNz ZXJ0X3dyYXBwZXIoInZhbGdyaW5kIiwgWyJ2YWxncmluZCJdKQpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tb2NrX2RydF91bml0dGVzdC5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnRfdW5pdHRl c3QucHkKaW5kZXggY2ZjZGYyNzZjMDJjZDJjOWUyM2VhM2ZkODlkZmEwMzRhZWZjMTA2MS4uMzdj NDU5MjJjOWMwMzdkZmNkZTBkNGMwMTMwODdiNzA0MjA5MWJlNCAxMDA3NTUKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tb2NrX2RydF91bml0dGVzdC5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21vY2tfZHJ0X3Vu aXR0ZXN0LnB5CkBAIC0zMywyMCArMzMsMjEgQEAgaW1wb3J0IHN5cwogaW1wb3J0IHVuaXR0ZXN0 CiAKIGZyb20gd2Via2l0cHkuY29tbW9uIGltcG9ydCBuZXdzdHJpbmdpbwotCitmcm9tIHdlYmtp dHB5LmNvbW1vbi5zeXN0ZW0uc3lzdGVtaG9zdF9tb2NrIGltcG9ydCBNb2NrU3lzdGVtSG9zdAog ZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydCBpbXBvcnQgbW9ja19kcnQKIGZyb20gd2Vi a2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IHBvcnRfdGVzdGNhc2UKIGZyb20gd2Via2l0 cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IHRlc3QKK2Zyb20gd2Via2l0cHkubGF5b3V0X3Rl c3RzLnBvcnQuZmFjdG9yeSBpbXBvcnQgUG9ydEZhY3RvcnkKK2Zyb20gd2Via2l0cHkudG9vbCBp bXBvcnQgbW9ja3Rvb2wKIAotZnJvbSB3ZWJraXRweS5jb21tb24uaG9zdF9tb2NrIGltcG9ydCBN b2NrSG9zdAogCi1mcm9tIHdlYmtpdHB5LnRvb2wgaW1wb3J0IG1vY2t0b29sCiBtb2NrX29wdGlv bnMgPSBtb2NrdG9vbC5Nb2NrT3B0aW9ucyhjb25maWd1cmF0aW9uPSdSZWxlYXNlJykKIAogCiBj bGFzcyBNb2NrRFJUUG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgIGRl ZiBtYWtlX3BvcnQoc2VsZiwgb3B0aW9ucz1tb2NrX29wdGlvbnMpOgotICAgICAgICBob3N0ID0g TW9ja0hvc3QoKQorICAgICAgICBob3N0ID0gTW9ja1N5c3RlbUhvc3QoKQorICAgICAgICB0ZXN0 LmFkZF91bml0X3Rlc3RzX3RvX21vY2tfZmlsZXN5c3RlbShob3N0LmZpbGVzeXN0ZW0pCiAgICAg ICAgIGlmIHN5cy5wbGF0Zm9ybSA9PSAnd2luMzInOgogICAgICAgICAgICAgIyBXZSB1c2UgdGhp cyBiZWNhdXNlIHRoZSAnd2luJyBwb3J0IGRvZXNuJ3Qgd29yayB5ZXQuCiAgICAgICAgICAgICBy ZXR1cm4gbW9ja19kcnQuTW9ja0RSVFBvcnQoaG9zdCwgcG9ydF9uYW1lPSdtb2NrLWNocm9taXVt LXdpbicsIG9wdGlvbnM9b3B0aW9ucykKQEAgLTU3LDcgKzU4LDcgQEAgY2xhc3MgTW9ja0RSVFBv cnRUZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RDYXNlKToKICAgICAgICAgcGFzcwogCiAgICAg ZGVmIHRlc3RfcG9ydF9uYW1lX2luX2NvbnN0cnVjdG9yKHNlbGYpOgotICAgICAgICBzZWxmLmFz c2VydFRydWUobW9ja19kcnQuTW9ja0RSVFBvcnQoTW9ja0hvc3QoKSwgcG9ydF9uYW1lPSdtb2Nr LXRlc3QnKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKG1vY2tfZHJ0Lk1vY2tEUlRQb3J0KE1v Y2tTeXN0ZW1Ib3N0KCksIHBvcnRfbmFtZT0nbW9jay10ZXN0JykpCiAKICAgICBkZWYgdGVzdF9j aGVja19zeXNfZGVwcyhzZWxmKToKICAgICAgICAgcGFzcwpAQCAtMTM5LDggKzE0MCw5IEBAIGNs YXNzIE1vY2tEUlRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogICAgIGRlZiBhc3NlcnRUZXN0 KHNlbGYsIHRlc3RfbmFtZSwgcGl4ZWxfdGVzdHMsIGV4cGVjdGVkX2NoZWNrc3VtPU5vbmUsIGRy dF9vdXRwdXQ9Tm9uZSwgaG9zdD1Ob25lKToKICAgICAgICAgcG9ydF9uYW1lID0gJ3Rlc3QnCi0g ICAgICAgIGhvc3QgPSBob3N0IG9yIE1vY2tIb3N0KCkKLSAgICAgICAgcG9ydCA9IGhvc3QucG9y dF9mYWN0b3J5LmdldChwb3J0X25hbWUpCisgICAgICAgIGhvc3QgPSBob3N0IG9yIE1vY2tTeXN0 ZW1Ib3N0KCkKKyAgICAgICAgdGVzdC5hZGRfdW5pdF90ZXN0c190b19tb2NrX2ZpbGVzeXN0ZW0o aG9zdC5maWxlc3lzdGVtKQorICAgICAgICBwb3J0ID0gUG9ydEZhY3RvcnkoaG9zdCkuZ2V0KHBv cnRfbmFtZSkKICAgICAgICAgZHJ0X2lucHV0LCBkcnRfb3V0cHV0ID0gc2VsZi5tYWtlX2lucHV0 X291dHB1dChwb3J0LCB0ZXN0X25hbWUsCiAgICAgICAgICAgICBwaXhlbF90ZXN0cywgZXhwZWN0 ZWRfY2hlY2tzdW0sIGRydF9vdXRwdXQpCiAKQEAgLTE2MSw3ICsxNjMsOCBAQCBjbGFzcyBNb2Nr RFJUVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3Rk ZXJyLmdldHZhbHVlKCksICcnKQogCiAgICAgZGVmIHRlc3RfbWFpbihzZWxmKToKLSAgICAgICAg aG9zdCA9IE1vY2tIb3N0KCkKKyAgICAgICAgaG9zdCA9IE1vY2tTeXN0ZW1Ib3N0KCkKKyAgICAg ICAgdGVzdC5hZGRfdW5pdF90ZXN0c190b19tb2NrX2ZpbGVzeXN0ZW0oaG9zdC5maWxlc3lzdGVt KQogICAgICAgICBzdGRpbiA9IG5ld3N0cmluZ2lvLlN0cmluZ0lPKCkKICAgICAgICAgc3Rkb3V0 ID0gbmV3c3RyaW5naW8uU3RyaW5nSU8oKQogICAgICAgICBzdGRlcnIgPSBuZXdzdHJpbmdpby5T dHJpbmdJTygpCkBAIC0yMzQsOCArMjM3LDggQEAgY2xhc3MgTW9ja0Nocm9taXVtRFJUVGVzdChN b2NrRFJUVGVzdCk6CiAgICAgICAgICAgICAgICAgICAgICcjRU9GXG4nXQogCiAgICAgZGVmIHRl c3RfcGl4ZWx0ZXN0X19mYWlscyhzZWxmKToKLSAgICAgICAgaG9zdCA9IE1vY2tIb3N0KCkKLSAg ICAgICAgdXJsID0gJyNVUkw6ZmlsZTovLyVzL2ZhaWx1cmVzL2V4cGVjdGVkL2NoZWNrc3VtLmh0 bWwnICUgaG9zdC5wb3J0X2ZhY3RvcnkuZ2V0KCd0ZXN0JykubGF5b3V0X3Rlc3RzX2RpcigpCisg ICAgICAgIGhvc3QgPSBNb2NrU3lzdGVtSG9zdCgpCisgICAgICAgIHVybCA9ICcjVVJMOmZpbGU6 Ly8lcy9mYWlsdXJlcy9leHBlY3RlZC9jaGVja3N1bS5odG1sJyAlIFBvcnRGYWN0b3J5KGhvc3Qp LmdldCgndGVzdCcpLmxheW91dF90ZXN0c19kaXIoKQogICAgICAgICBzZWxmLmFzc2VydFRlc3Qo J2ZhaWx1cmVzL2V4cGVjdGVkL2NoZWNrc3VtLmh0bWwnLCBwaXhlbF90ZXN0cz1UcnVlLAogICAg ICAgICAgICAgZXhwZWN0ZWRfY2hlY2tzdW09J3dyb25nLWNoZWNrc3VtJywKICAgICAgICAgICAg IGRydF9vdXRwdXQ9W3VybCArICdcbicsCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5weQppbmRleCBmNDZhNDQwY2RlODUx ZmQ2NGI1MTM0ZTRlYzNjZjJmMGI0Y2VlMTA1Li42ZGNjM2Y1ZDg1Y2I0NDBhNDgwZjJlYjk2ZGNj ODY4YjU4MjNjODAxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvcXRfdW5pdHRlc3QucHkKQEAgLTI4LDEzICsyOCwxMiBAQAogCiBpbXBv cnQgdW5pdHRlc3QKIAotZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZV9tb2Nr IGltcG9ydCBNb2NrRXhlY3V0aXZlMgorZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1 dGl2ZV9tb2NrIGltcG9ydCBNb2NrRXhlY3V0aXZlLCBNb2NrRXhlY3V0aXZlMgogZnJvbSB3ZWJr aXRweS5jb21tb24uc3lzdGVtLm91dHB1dGNhcHR1cmUgaW1wb3J0IE91dHB1dENhcHR1cmUKLWZy b20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQucXQgaW1wb3J0IFF0UG9ydAorZnJvbSB3ZWJr aXRweS5jb21tb24uc3lzdGVtLnN5c3RlbWhvc3RfbW9jayBpbXBvcnQgTW9ja1N5c3RlbUhvc3QK IGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IHBvcnRfdGVzdGNhc2UKK2Zy b20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQucXQgaW1wb3J0IFF0UG9ydAogZnJvbSB3ZWJr aXRweS50b29sLm1vY2t0b29sIGltcG9ydCBNb2NrT3B0aW9ucwotZnJvbSB3ZWJraXRweS5jb21t b24uc3lzdGVtLmV4ZWN1dGl2ZV9tb2NrIGltcG9ydCBNb2NrRXhlY3V0aXZlCi1mcm9tIHdlYmtp dHB5LmNvbW1vbi5ob3N0X21vY2sgaW1wb3J0IE1vY2tIb3N0CiAKIAogY2xhc3MgUXRQb3J0VGVz dChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZSk6CkBAIC00NCw3ICs0Myw3IEBAIGNsYXNzIFF0 UG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgICAgICAjIEZJWE1FOiBQ b3J0IGNvbnN0cnVjdG9ycyBzaG91bGQgbm90ICJwYXJzZSIgdGhlIHBvcnQgbmFtZSwgYnV0CiAg ICAgICAgICMgcmF0aGVyIGJlIHBhc3NlZCBjb21wb25lbnRzIChkaXJlY3RseSBvciB2aWEgc2V0 dGVycykuICBPbmNlCiAgICAgICAgICMgd2UgZml4IHRoYXQsIHRoaXMgbWV0aG9kIHdpbGwgbmVl ZCBhIHJlLXdyaXRlLgotICAgICAgICBob3N0ID0gTW9ja0hvc3QoKQorICAgICAgICBob3N0ID0g TW9ja1N5c3RlbUhvc3QoKQogICAgICAgICBob3N0LmV4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUy KHNlbGYuX3F0X3ZlcnNpb24ocXRfdmVyc2lvbikpCiAgICAgICAgIHBvcnQgPSBRdFBvcnQoaG9z dCwgc3lzX3BsYXRmb3JtPXN5c19wbGF0Zm9ybSwgb3B0aW9ucz1Nb2NrT3B0aW9ucyh3ZWJraXRf dGVzdF9ydW5uZXI9dXNlX3dlYmtpdDIsIHBsYXRmb3JtPSdxdCcpKQogICAgICAgICBhYnNvbHV0 ZV9zZWFyY2hfcGF0aHMgPSBtYXAocG9ydC5fd2Via2l0X2Jhc2VsaW5lX3BhdGgsIHNlYXJjaF9w YXRocykKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvd2Via2l0X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC93ZWJraXRfdW5pdHRlc3QucHkKaW5kZXggNzhiOGU3NTFlODg4NmE0ODI1MDdmMTU4 ZWFiYmI0NzJlNGY1ZDJlOS4uMDgwYjFlOTVhMjBjMTQxMzQzZjgzMzg0ZTIxOThhNjY3NmEwYjQz NSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93 ZWJraXRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC93ZWJraXRfdW5pdHRlc3QucHkKQEAgLTI4LDEwICsyOCwxMCBAQAogaW1wb3J0IGxv Z2dpbmcKIGltcG9ydCB1bml0dGVzdAogCi1mcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0X21vY2sg aW1wb3J0IE1vY2tIb3N0CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlX21v Y2sgaW1wb3J0IE1vY2tFeGVjdXRpdmUKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5maWxl c3lzdGVtX21vY2sgaW1wb3J0IE1vY2tGaWxlU3lzdGVtCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5z eXN0ZW0ub3V0cHV0Y2FwdHVyZSBpbXBvcnQgT3V0cHV0Q2FwdHVyZQorZnJvbSB3ZWJraXRweS5j b21tb24uc3lzdGVtLnN5c3RlbWhvc3RfbW9jayBpbXBvcnQgTW9ja1N5c3RlbUhvc3QKIGZyb20g d2Via2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVscy50ZXN0X2NvbmZpZ3VyYXRpb24gaW1wb3J0IFRl c3RDb25maWd1cmF0aW9uCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0IGltcG9ydCBw b3J0X3Rlc3RjYXNlCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0LndlYmtpdCBpbXBv cnQgV2ViS2l0UG9ydCwgV2ViS2l0RHJpdmVyCkBAIC00Niw3ICs0Niw3IEBAIGNsYXNzIFRlc3RX ZWJLaXRQb3J0KFdlYktpdFBvcnQpOgogICAgICAgICAgICAgICAgICAqKmt3YXJncyk6CiAgICAg ICAgIHNlbGYuc3ltYm9sc19zdHJpbmcgPSBzeW1ib2xzX3N0cmluZyAgIyBQYXNzaW5nICIiIGRp c2FibGVzIGFsbCBzdGF0aWNseS1kZXRlY3RhYmxlIGZlYXR1cmVzLgogICAgICAgICBzZWxmLmZl YXR1cmVfbGlzdCA9IGZlYXR1cmVfbGlzdCAgIyBQYXNzaW5nIFtdIGRpc2FibGVzIGFsbCBydW50 aW1lLWRldGVjdGFibGUgZmVhdHVyZXMuCi0gICAgICAgIGhvc3QgPSBob3N0IG9yIE1vY2tIb3N0 KCkKKyAgICAgICAgaG9zdCA9IGhvc3Qgb3IgTW9ja1N5c3RlbUhvc3QoKQogICAgICAgICBXZWJL aXRQb3J0Ll9faW5pdF9fKHNlbGYsIGhvc3Q9aG9zdCwgKiprd2FyZ3MpCiAKICAgICBkZWYgYWxs X3Rlc3RfY29uZmlndXJhdGlvbnMoc2VsZik6CkBAIC02OSwxMyArNjksMTMgQEAgY2xhc3MgV2Vi S2l0UG9ydFVuaXRUZXN0cyh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRlc3RfZGVmYXVs dF9vcHRpb25zKHNlbGYpOgogICAgICAgICAjIFRoZSBXZWJLaXQgcG9ydHMgb3ZlcnJpZGUgbmV3 LXJ1bi13ZWJraXQtdGVzdCBkZWZhdWx0IG9wdGlvbnMuCiAgICAgICAgIG9wdGlvbnMgPSBNb2Nr T3B0aW9ucyhwaXhlbF90ZXN0cz1Ob25lLCB0aW1lX291dF9tcz1Ob25lKQotICAgICAgICBwb3J0 ID0gV2ViS2l0UG9ydChNb2NrSG9zdCgpLCBvcHRpb25zPW9wdGlvbnMpCisgICAgICAgIHBvcnQg PSBXZWJLaXRQb3J0KE1vY2tTeXN0ZW1Ib3N0KCksIG9wdGlvbnM9b3B0aW9ucykKICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbHMocG9ydC5fb3B0aW9ucy5waXhlbF90ZXN0cywgRmFsc2UpCiAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQuX29wdGlvbnMudGltZV9vdXRfbXMsIDM1MDAwKQog CiAgICAgICAgICMgTm90ZSB0aGF0IHdlIGRvbid0IG92ZXJyaWRlIG9wdGlvbnMgaWYgc3BlY2lm aWVkIGJ5IHRoZSB1c2VyLgogICAgICAgICBvcHRpb25zID0gTW9ja09wdGlvbnMocGl4ZWxfdGVz dHM9VHJ1ZSwgdGltZV9vdXRfbXM9NjAwMCkKLSAgICAgICAgcG9ydCA9IFdlYktpdFBvcnQoTW9j a0hvc3QoKSwgb3B0aW9ucz1vcHRpb25zKQorICAgICAgICBwb3J0ID0gV2ViS2l0UG9ydChNb2Nr U3lzdGVtSG9zdCgpLCBvcHRpb25zPW9wdGlvbnMpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxz KHBvcnQuX29wdGlvbnMucGl4ZWxfdGVzdHMsIFRydWUpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWxzKHBvcnQuX29wdGlvbnMudGltZV9vdXRfbXMsIDYwMDApCiAKQEAgLTEyNSw3ICsxMjUsNyBA QCBjbGFzcyBXZWJLaXRQb3J0VGVzdChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZSk6CiAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVzdWx0X2RpcmVjdG9yaWVzLCBleHBlY3RlZF9kaXJlY3Rv cmllcykKIAogICAgIGRlZiB0ZXN0X3J1bnRpbWVfZmVhdHVyZV9saXN0KHNlbGYpOgotICAgICAg ICBwb3J0ID0gV2ViS2l0UG9ydChNb2NrSG9zdCgpKQorICAgICAgICBwb3J0ID0gV2ViS2l0UG9y dChNb2NrU3lzdGVtSG9zdCgpKQogICAgICAgICBwb3J0Ll9leGVjdXRpdmUucnVuX2NvbW1hbmQg PSBsYW1iZGEgY29tbWFuZCwgY3dkPU5vbmUsIGVycm9yX2hhbmRsZXI9Tm9uZTogIk5vbnNlbnNl IgogICAgICAgICAjIHJ1bnRpbWVfZmVhdHVyZXNfbGlzdCByZXR1cm5zIE5vbmUgd2hlbiBpdHMg cmVzdWx0cyBhcmUgbWVhbmluZ2xlc3MgKGl0IGNvdWxkbid0IHJ1biBEUlQgb3IgcGFyc2UgdGhl IG91dHB1dCwgZXRjLikKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5fcnVudGltZV9m ZWF0dXJlX2xpc3QoKSwgTm9uZSkKQEAgLTE1Niw3ICsxNTYsNyBAQCBjbGFzcyBXZWJLaXRQb3J0 VGVzdChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZSk6CiAKICAgICBkZWYgdGVzdF90ZXN0X2V4 cGVjdGF0aW9ucyhzZWxmKToKICAgICAgICAgIyBDaGVjayB0aGF0IHdlIHJlYWQgdGhlIGV4cGVj dGF0aW9ucyBmaWxlCi0gICAgICAgIGhvc3QgPSBNb2NrSG9zdCgpCisgICAgICAgIGhvc3QgPSBN b2NrU3lzdGVtSG9zdCgpCiAgICAgICAgIGhvc3QuZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUo Jy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL3Rlc3R3ZWJraXRwb3J0L3Rlc3Rf ZXhwZWN0YXRpb25zLnR4dCcsCiAgICAgICAgICAgICAnQlVHX1RFU1RFWFBFQ1RBVElPTlMgU0tJ UCA6IGZhc3QvaHRtbC9hcnRpY2xlLWVsZW1lbnQuaHRtbCA9IEZBSUxcbicpCiAgICAgICAgIHBv cnQgPSBUZXN0V2ViS2l0UG9ydChob3N0PWhvc3QpCg==