208485 2020-03-02 16:30:07 -0800 Add Unittest to commits_for_uploads() 2020-03-03 13:08:55 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jlewis3 jlewis3 ews-watchlist glenn jbedard webkit-bug-importer oldest_to_newest 1624821 0 jlewis3 2020-03-02 16:30:07 -0800 While working on commits_for_upload() I found multiple issues due to the fact that it had no unit testing. 1624822 1 webkit-bug-importer 2020-03-02 16:30:20 -0800 <rdar://problem/59973902> 1624854 2 392228 jlewis3 2020-03-02 17:17:36 -0800 Created attachment 392228 Patch Uploading initial patch to test on both git and svn style checkouts. 1624864 3 392228 jlewis3 2020-03-02 17:36:02 -0800 Comment on attachment 392228 Patch Tested run-webkit-test with all permutations of checkouts that we expect. 1624871 4 392228 jbedard 2020-03-02 17:48:39 -0800 Comment on attachment 392228 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=392228&action=review > Tools/ChangeLog:26 > + (PortTest.make_port): changed from MockSystemHost to MockHost This deserves a 'why'. You mentioned in person the rationale, you should call that out here. > Tools/Scripts/webkitpy/common/checkout/scm/stub_repository.py:43 > self._filesystem = filesystem Can you check if the SCM constructor does this already? Feels like it should. If it doesn't lets leave this code as is. > Tools/Scripts/webkitpy/common/checkout/scm/stub_repository_unittest.py:46 > + def mock_executive_for_stub_repository(): This function is a bit weird unless you intend to expand it later and add mock command results. My general rule is if you find yourself defining more than one of the host member objects, you should return a host object. Here, I think we should either go back to the mock host or just pass a constructed executive inline to each calcite (and import MockExecutive instead of executive_mock) 1625174 5 392308 jlewis3 2020-03-03 12:20:10 -0800 Created attachment 392308 Patch This should address the various comments that were given. 1625196 6 jlewis3 2020-03-03 13:08:55 -0800 Committed r257796: <https://trac.webkit.org/changeset/257796> 392228 2020-03-02 17:17:36 -0800 2020-03-03 12:20:09 -0800 Patch bug-208485-20200302171735.patch text/plain 12383 jlewis3 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3NzMyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjQxMDUxMTMxNDQ5OGI1ODRlODM5YzE0MDcyNGMwMGM3 ZjNkZGY1YS4uYzAzZjFlOGZmNjE3YjdiNGEyYmQwMDg4ZmJhOTIzZGU3MTcwNDI3YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMx IEBACisyMDIwLTAzLTAyICBNYXR0IExld2lzICA8amxld2lzM0BhcHBsZS5jb20+CisKKyAgICAg ICAgQWRkIFVuaXR0ZXN0IHRvIGNvbW1pdHNfZm9yX3VwbG9hZCgpIGFuZCBmaXggU3R1YlJlcG9z aXRvcnkgdW5pdHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMDg0ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdHViX3JlcG9z aXRvcnkucHk6CisgICAgICAgIChTdHViUmVwb3NpdG9yeS5fX2luaXRfXyk6IEFkZGVkIHN1cGVy IGZvciBTQ00uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2Nt L3N0dWJfcmVwb3NpdG9yeV91bml0dGVzdC5weTogQWRqdXN0ZWQgdGVzdHMgdG8gY29tcGx5IHdp dGggbmV3IGluaXRzLgorICAgICAgICAoU3R1YlJlcG9zaXRvcnlUZXN0Lm1vY2tfZmlsZXN5c3Rl bV9mb3Jfc3R1Yl9yZXBvc2l0b3J5KTogCisgICAgICAgIChTdHViUmVwb3NpdG9yeVRlc3QpOgor ICAgICAgICAoU3R1YlJlcG9zaXRvcnlUZXN0Lm1vY2tfZXhlY3V0aXZlX2Zvcl9zdHViX3JlcG9z aXRvcnkpOiBBZGRlZCBpbiBjYWxsIHRvIG1vY2sgZXhlY3V0aXZlLgorICAgICAgICAoU3R1YlJl cG9zaXRvcnlUZXN0LnRlc3RfaW5fd29ya2luZ19kaXJlY3RvcnkpOgorICAgICAgICAoU3R1YlJl cG9zaXRvcnlUZXN0LnRlc3RfbmF0aXZlX3JldmlzaW9uKToKKyAgICAgICAgKFN0dWJSZXBvc2l0 b3J5VGVzdC50ZXN0X25hdGl2ZV9icmFuY2gpOgorICAgICAgICAoU3R1YlJlcG9zaXRvcnlUZXN0 LnRlc3Rfc3ZuX3JldmlzaW9uKToKKyAgICAgICAgKFN0dWJSZXBvc2l0b3J5VGVzdC50ZXN0X2Zp bmRfY2hlY2tvdXRfcm9vdCk6CisgICAgICAgIChTdHViUmVwb3NpdG9yeVRlc3QudGVzdF9maW5k X2NoZWNrb3V0X3Jvb3RfZmFpbHVyZSk6CisgICAgICAgIChTdHViUmVwb3NpdG9yeVRlc3QudGVz dF9maW5kX3BhcmVudF9wYXRoX21hdGNoaW5nX2NhbGxiYWNrX2NvbmRpdGlvbl93aXRoX2ZpbGVf c3lzdGVtKToKKyAgICAgICAgKFN0dWJSZXBvc2l0b3J5VGVzdC5tb2NrX2hvc3RfZm9yX3N0dWJf cmVwb3NpdG9yeSk6IERlbGV0ZWQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHNfdW5pdHRlc3QucHk6IEFkZGVkIHVuaXQgdGVz dCBmb3IgZmluZGluZyByZXZpc2lvbiBhbmQgdGhhdCByZXZpc2lvbiBleGlzdHMKKyAgICAgICAg KFN1bW1hcml6ZWRSZXN1bHRzVGVzdC50ZXN0X3N2bl9yZXZpc2lvbl9leGlzdHMpOgorICAgICAg ICAoU3VtbWFyaXplZFJlc3VsdHNUZXN0LnRlc3Rfc3ZuX3JldmlzaW9uKToKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZV91bml0dGVzdC5weTogQWRkZWQgVW5pdHRlc3QgZm9y IGNvbW1pdHNfZm9yX3VwbG9hZCgpCisgICAgICAgIChQb3J0VGVzdC5tYWtlX3BvcnQpOiBjaGFu Z2VkIGZyb20gTW9ja1N5c3RlbUhvc3QgdG8gTW9ja0hvc3QKKyAgICAgICAgKHRlc3RfY29tbWl0 c19mb3JfdXBsb2FkKToKKwogMjAyMC0wMy0wMiAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFw cGxlLmNvbT4KIAogICAgICAgICBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOiBFbmFibGUgY29va2ll IGJsb2NraW5nIGFuZCB0aGUgU3RvcmFnZSBBY2Nlc3MgQVBJIGluIGVwaGVtZXJhbCBzZXNzaW9u cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2Nt L3N0dWJfcmVwb3NpdG9yeS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNr b3V0L3NjbS9zdHViX3JlcG9zaXRvcnkucHkKaW5kZXggM2JiOTFlMmJiN2E3ZGFlZDI3YTBkMmI2 Y2Q0ZjFjNTEzZGJjZWRjYS4uNDk4NzA4YmQxZjhjMjBlNWNlZWM0NzA2Y2M5M2JiMGNlNTZmZjA1 ZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2Nt L3N0dWJfcmVwb3NpdG9yeS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc3R1Yl9yZXBvc2l0b3J5LnB5CkBAIC0zNyw5ICszNywxMSBAQCBfbG9nID0g bG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiBjbGFzcyBTdHViUmVwb3NpdG9yeShTQ00pOgog ICAgIF9zdHViX3JlcG9zaXRvcnlfanNvbiA9ICdjaGVja291dF9pbmZvcm1hdGlvbi5qc29uJwog Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIGN3ZCwgZmlsZXN5c3RlbSwgKiprd2FyZ3MpOgotICAg ICAgICAjIFdlIGNyZWF0ZSBvdXIgb3duIGNoZWNrb3V0IHJvb3QgYW5kIGZpbGVzeXN0ZW0gaGVy ZSBiZWNhdXNlIHdlIGFyZSB3b3JraW5nIGFyb3VuZCB0aGUgZmFjdCB0aGF0IHdlIGRvbid0IGhh dmUgYW5kIGFjdHVhbCBTQ00gc2NoZW1lLgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBjd2QsIGZp bGVzeXN0ZW0sIGV4ZWN1dGl2ZSwgcGF0Y2hfZGlyZWN0b3JpZXM9Tm9uZSwgKiprd2FyZ3MpOgor ICAgICAgICBTQ00uX19pbml0X18oc2VsZiwgY3dkLCBmaWxlc3lzdGVtLCAqKmt3YXJncykKKyAg ICAgICAgIyBXZSBjcmVhdGUgb3VyIG93biBjaGVja291dCByb290LCBmaWxlc3lzdGVtLCBhbmQg ZXhlY3V0aXZlIGhlcmUgYmVjYXVzZSB3ZSBhcmUgd29ya2luZyBhcm91bmQgdGhlIGZhY3QgdGhh dCB3ZSBkb24ndCBoYXZlIGFuZCBhY3R1YWwgU0NNIHNjaGVtZS4KICAgICAgICAgc2VsZi5fZmls ZXN5c3RlbSA9IGZpbGVzeXN0ZW0KKyAgICAgICAgc2VsZi5fZXhlY3V0aXZlID0gZXhlY3V0aXZl CiAgICAgICAgIHNlbGYuY2hlY2tvdXRfcm9vdCA9IHNlbGYuZmluZF9jaGVja291dF9yb290KGN3 ZCkKIAogICAgIEBjbGFzc21ldGhvZApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY2hlY2tvdXQvc2NtL3N0dWJfcmVwb3NpdG9yeV91bml0dGVzdC5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdHViX3JlcG9zaXRvcnlfdW5p dHRlc3QucHkKaW5kZXggNDI2ZGYxYjZmNzIyYzA5OTgxMmRmZGU4YzE3MDcyY2QxOTViYjgyMy4u Mzg1ZDczYjhkZTkyZjg1M2Y3Y2QxMmUwYzJmYThjMmI4ZWIxOTM1NyAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N0dWJfcmVwb3NpdG9yeV91 bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9z Y20vc3R1Yl9yZXBvc2l0b3J5X3VuaXR0ZXN0LnB5CkBAIC0yMyw2ICsyMyw3IEBACiBpbXBvcnQg dW5pdHRlc3QKIAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtIGltcG9ydCBmaWxlc3lzdGVt X21vY2sKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbSBpbXBvcnQgZXhlY3V0aXZlX21vY2sK IGZyb20gd2Via2l0cHkuY29tbW9uLmNoZWNrb3V0LnNjbS5zdHViX3JlcG9zaXRvcnkgaW1wb3J0 IFN0dWJSZXBvc2l0b3J5CiAKIG1vY2tfc3R1Yl9yZXBvc2l0b3J5X2pzb24gPSB7J2JyYW5jaCc6 ICd0cnVuaycsICdpZCc6ICcyNzM4NDk5J30KQEAgLTM3LDQyICszOCw1MiBAQCBGQUtFX0ZJTEVT ID0gewogY2xhc3MgU3R1YlJlcG9zaXRvcnlUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogICAg IEBzdGF0aWNtZXRob2QKLSAgICBkZWYgbW9ja19ob3N0X2Zvcl9zdHViX3JlcG9zaXRvcnkoKToK LSAgICAgICAgaG9zdCA9IGZpbGVzeXN0ZW1fbW9jay5Nb2NrRmlsZVN5c3RlbShmaWxlcz1GQUtF X0ZJTEVTKQotICAgICAgICByZXR1cm4gaG9zdAorICAgIGRlZiBtb2NrX2ZpbGVzeXN0ZW1fZm9y X3N0dWJfcmVwb3NpdG9yeSgpOgorICAgICAgICBmaWxlc3lzdGVtID0gZmlsZXN5c3RlbV9tb2Nr Lk1vY2tGaWxlU3lzdGVtKGZpbGVzPUZBS0VfRklMRVMpCisgICAgICAgIHJldHVybiBmaWxlc3lz dGVtCisKKyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIG1vY2tfZXhlY3V0aXZlX2Zvcl9zdHVi X3JlcG9zaXRvcnkoKToKKyAgICAgICAgZXhlY3V0aXZlID0gZXhlY3V0aXZlX21vY2suTW9ja0V4 ZWN1dGl2ZSgpCisgICAgICAgIHJldHVybiBleGVjdXRpdmUKIAogICAgIGRlZiB0ZXN0X2luX3dv cmtpbmdfZGlyZWN0b3J5KHNlbGYpOgotICAgICAgICBob3N0ID0gU3R1YlJlcG9zaXRvcnlUZXN0 Lm1vY2tfaG9zdF9mb3Jfc3R1Yl9yZXBvc2l0b3J5KCkKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVl KFN0dWJSZXBvc2l0b3J5LmluX3dvcmtpbmdfZGlyZWN0b3J5KHBhdGg9aG9zdC5qb2luKGhvc3Qu Z2V0Y3dkKCksICdUZXN0RGlyZWN0b3J5JywgJ1Rlc3REaXJlY3RvcnkyJywgJ1Rlc3REaXJlY3Rv cnkzJyksIGZpbGVzeXN0ZW09aG9zdCkpCisgICAgICAgIGZpbGVzeXN0ZW0gPSBTdHViUmVwb3Np dG9yeVRlc3QubW9ja19maWxlc3lzdGVtX2Zvcl9zdHViX3JlcG9zaXRvcnkoKQorICAgICAgICBz ZWxmLmFzc2VydFRydWUoU3R1YlJlcG9zaXRvcnkuaW5fd29ya2luZ19kaXJlY3RvcnkocGF0aD1m aWxlc3lzdGVtLmpvaW4oZmlsZXN5c3RlbS5nZXRjd2QoKSwgJ1Rlc3REaXJlY3RvcnknLCAnVGVz dERpcmVjdG9yeTInLCAnVGVzdERpcmVjdG9yeTMnKSwgZmlsZXN5c3RlbT1maWxlc3lzdGVtKSkK IAogICAgIGRlZiB0ZXN0X25hdGl2ZV9yZXZpc2lvbihzZWxmKToKLSAgICAgICAgaG9zdCA9IFN0 dWJSZXBvc2l0b3J5VGVzdC5tb2NrX2hvc3RfZm9yX3N0dWJfcmVwb3NpdG9yeSgpCi0gICAgICAg IHJlcG9zaXRvcnkgPSBTdHViUmVwb3NpdG9yeShjd2Q9aG9zdC5nZXRjd2QoKSwgZmlsZXN5c3Rl bT1ob3N0KQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJlcG9zaXRvcnkubmF0aXZlX3Jldmlz aW9uKHBhdGg9aG9zdC5qb2luKGhvc3QuZ2V0Y3dkKCksICdUZXN0RGlyZWN0b3J5JywgJ1Rlc3RE aXJlY3RvcnkyJywgJ1Rlc3REaXJlY3RvcnkzJykpLCBtb2NrX3N0dWJfcmVwb3NpdG9yeV9qc29u WydpZCddKQorICAgICAgICBmaWxlc3lzdGVtID0gU3R1YlJlcG9zaXRvcnlUZXN0Lm1vY2tfZmls ZXN5c3RlbV9mb3Jfc3R1Yl9yZXBvc2l0b3J5KCkKKyAgICAgICAgZXhlY3V0aXZlID0gU3R1YlJl cG9zaXRvcnlUZXN0Lm1vY2tfZXhlY3V0aXZlX2Zvcl9zdHViX3JlcG9zaXRvcnkoKQorICAgICAg ICByZXBvc2l0b3J5ID0gU3R1YlJlcG9zaXRvcnkoY3dkPWZpbGVzeXN0ZW0uZ2V0Y3dkKCksIGZp bGVzeXN0ZW09ZmlsZXN5c3RlbSwgZXhlY3V0aXZlPWV4ZWN1dGl2ZSkKKyAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChyZXBvc2l0b3J5Lm5hdGl2ZV9yZXZpc2lvbihwYXRoPWZpbGVzeXN0ZW0uam9p bihmaWxlc3lzdGVtLmdldGN3ZCgpLCAnVGVzdERpcmVjdG9yeScsICdUZXN0RGlyZWN0b3J5Mics ICdUZXN0RGlyZWN0b3J5MycpKSwgbW9ja19zdHViX3JlcG9zaXRvcnlfanNvblsnaWQnXSkKIAog ICAgIGRlZiB0ZXN0X25hdGl2ZV9icmFuY2goc2VsZik6Ci0gICAgICAgIGhvc3QgPSBTdHViUmVw b3NpdG9yeVRlc3QubW9ja19ob3N0X2Zvcl9zdHViX3JlcG9zaXRvcnkoKQotICAgICAgICByZXBv c2l0b3J5ID0gU3R1YlJlcG9zaXRvcnkoY3dkPWhvc3QuZ2V0Y3dkKCksIGZpbGVzeXN0ZW09aG9z dCkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChyZXBvc2l0b3J5Lm5hdGl2ZV9icmFuY2gocGF0 aD1ob3N0LmpvaW4oaG9zdC5nZXRjd2QoKSwgJ1Rlc3REaXJlY3RvcnknLCAnVGVzdERpcmVjdG9y eTInLCAnVGVzdERpcmVjdG9yeTMnKSksIG1vY2tfc3R1Yl9yZXBvc2l0b3J5X2pzb25bJ2JyYW5j aCddKQorICAgICAgICBmaWxlc3lzdGVtID0gU3R1YlJlcG9zaXRvcnlUZXN0Lm1vY2tfZmlsZXN5 c3RlbV9mb3Jfc3R1Yl9yZXBvc2l0b3J5KCkKKyAgICAgICAgZXhlY3V0aXZlID0gU3R1YlJlcG9z aXRvcnlUZXN0Lm1vY2tfZXhlY3V0aXZlX2Zvcl9zdHViX3JlcG9zaXRvcnkoKQorICAgICAgICBy ZXBvc2l0b3J5ID0gU3R1YlJlcG9zaXRvcnkoY3dkPWZpbGVzeXN0ZW0uZ2V0Y3dkKCksIGZpbGVz eXN0ZW09ZmlsZXN5c3RlbSwgZXhlY3V0aXZlPWV4ZWN1dGl2ZSkKKyAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChyZXBvc2l0b3J5Lm5hdGl2ZV9icmFuY2gocGF0aD1maWxlc3lzdGVtLmpvaW4oZmls ZXN5c3RlbS5nZXRjd2QoKSwgJ1Rlc3REaXJlY3RvcnknLCAnVGVzdERpcmVjdG9yeTInLCAnVGVz dERpcmVjdG9yeTMnKSksIG1vY2tfc3R1Yl9yZXBvc2l0b3J5X2pzb25bJ2JyYW5jaCddKQogCiAg ICAgZGVmIHRlc3Rfc3ZuX3JldmlzaW9uKHNlbGYpOgotICAgICAgICBob3N0ID0gU3R1YlJlcG9z aXRvcnlUZXN0Lm1vY2tfaG9zdF9mb3Jfc3R1Yl9yZXBvc2l0b3J5KCkKLSAgICAgICAgcmVwb3Np dG9yeSA9IFN0dWJSZXBvc2l0b3J5KGN3ZD1ob3N0LmdldGN3ZCgpLCBmaWxlc3lzdGVtPWhvc3Qp Ci0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVwb3NpdG9yeS5zdm5fcmV2aXNpb24ocGF0aD1o b3N0LmpvaW4oaG9zdC5nZXRjd2QoKSwgJ1Rlc3REaXJlY3RvcnknLCAnVGVzdERpcmVjdG9yeTIn LCAnVGVzdERpcmVjdG9yeTMnKSksIG1vY2tfc3R1Yl9yZXBvc2l0b3J5X2pzb25bJ2lkJ10pCisg ICAgICAgIGZpbGVzeXN0ZW0gPSBTdHViUmVwb3NpdG9yeVRlc3QubW9ja19maWxlc3lzdGVtX2Zv cl9zdHViX3JlcG9zaXRvcnkoKQorICAgICAgICBleGVjdXRpdmUgPSBTdHViUmVwb3NpdG9yeVRl c3QubW9ja19leGVjdXRpdmVfZm9yX3N0dWJfcmVwb3NpdG9yeSgpCisgICAgICAgIHJlcG9zaXRv cnkgPSBTdHViUmVwb3NpdG9yeShjd2Q9ZmlsZXN5c3RlbS5nZXRjd2QoKSwgZmlsZXN5c3RlbT1m aWxlc3lzdGVtLCBleGVjdXRpdmU9ZXhlY3V0aXZlKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFs KHJlcG9zaXRvcnkuc3ZuX3JldmlzaW9uKHBhdGg9ZmlsZXN5c3RlbS5qb2luKGZpbGVzeXN0ZW0u Z2V0Y3dkKCksICdUZXN0RGlyZWN0b3J5JywgJ1Rlc3REaXJlY3RvcnkyJywgJ1Rlc3REaXJlY3Rv cnkzJykpLCBtb2NrX3N0dWJfcmVwb3NpdG9yeV9qc29uWydpZCddKQogCiAgICAgZGVmIHRlc3Rf ZmluZF9jaGVja291dF9yb290KHNlbGYpOgotICAgICAgICBob3N0ID0gU3R1YlJlcG9zaXRvcnlU ZXN0Lm1vY2tfaG9zdF9mb3Jfc3R1Yl9yZXBvc2l0b3J5KCkKLSAgICAgICAgcmVwb3NpdG9yeSA9 IFN0dWJSZXBvc2l0b3J5KGN3ZD1ob3N0LmdldGN3ZCgpLCBmaWxlc3lzdGVtPWhvc3QpCi0gICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHJlcG9zaXRvcnkuZmluZF9jaGVja291dF9yb290KHBhdGg9 aG9zdC5qb2luKCdUZXN0RGlyZWN0b3J5JywgJ1Rlc3REaXJlY3RvcnkyJywgJ1Rlc3REaXJlY3Rv cnkzJykpLCBob3N0LmpvaW4oaG9zdC5nZXRjd2QoKSwgJ1Rlc3REaXJlY3RvcnknLCAnVGVzdERp cmVjdG9yeTInKSkKKyAgICAgICAgZmlsZXN5c3RlbSA9IFN0dWJSZXBvc2l0b3J5VGVzdC5tb2Nr X2ZpbGVzeXN0ZW1fZm9yX3N0dWJfcmVwb3NpdG9yeSgpCisgICAgICAgIGV4ZWN1dGl2ZSA9IFN0 dWJSZXBvc2l0b3J5VGVzdC5tb2NrX2V4ZWN1dGl2ZV9mb3Jfc3R1Yl9yZXBvc2l0b3J5KCkKKyAg ICAgICAgcmVwb3NpdG9yeSA9IFN0dWJSZXBvc2l0b3J5KGN3ZD1maWxlc3lzdGVtLmdldGN3ZCgp LCBmaWxlc3lzdGVtPWZpbGVzeXN0ZW0sIGV4ZWN1dGl2ZT1leGVjdXRpdmUpCisgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWxzKHJlcG9zaXRvcnkuZmluZF9jaGVja291dF9yb290KHBhdGg9ZmlsZXN5 c3RlbS5qb2luKCdUZXN0RGlyZWN0b3J5JywgJ1Rlc3REaXJlY3RvcnkyJywgJ1Rlc3REaXJlY3Rv cnkzJykpLCBmaWxlc3lzdGVtLmpvaW4oZmlsZXN5c3RlbS5nZXRjd2QoKSwgJ1Rlc3REaXJlY3Rv cnknLCAnVGVzdERpcmVjdG9yeTInKSkKIAogICAgIGRlZiB0ZXN0X2ZpbmRfY2hlY2tvdXRfcm9v dF9mYWlsdXJlKHNlbGYpOgotICAgICAgICBob3N0ID0gU3R1YlJlcG9zaXRvcnlUZXN0Lm1vY2tf aG9zdF9mb3Jfc3R1Yl9yZXBvc2l0b3J5KCkKLSAgICAgICAgcmVwb3NpdG9yeSA9IFN0dWJSZXBv c2l0b3J5KGN3ZD1ob3N0LmdldGN3ZCgpLCBmaWxlc3lzdGVtPWhvc3QpCi0gICAgICAgIHNlbGYu YXNzZXJ0SXNOb25lKHJlcG9zaXRvcnkuZmluZF9jaGVja291dF9yb290KHBhdGg9aG9zdC5nZXRj d2QoKSkpCisgICAgICAgIGZpbGVzeXN0ZW0gPSBTdHViUmVwb3NpdG9yeVRlc3QubW9ja19maWxl c3lzdGVtX2Zvcl9zdHViX3JlcG9zaXRvcnkoKQorICAgICAgICBleGVjdXRpdmUgPSBTdHViUmVw b3NpdG9yeVRlc3QubW9ja19leGVjdXRpdmVfZm9yX3N0dWJfcmVwb3NpdG9yeSgpCisgICAgICAg IHJlcG9zaXRvcnkgPSBTdHViUmVwb3NpdG9yeShjd2Q9ZmlsZXN5c3RlbS5nZXRjd2QoKSwgZmls ZXN5c3RlbT1maWxlc3lzdGVtLCBleGVjdXRpdmU9ZXhlY3V0aXZlKQorICAgICAgICBzZWxmLmFz c2VydElzTm9uZShyZXBvc2l0b3J5LmZpbmRfY2hlY2tvdXRfcm9vdChwYXRoPWZpbGVzeXN0ZW0u Z2V0Y3dkKCkpKQogCiAgICAgZGVmIHRlc3RfZmluZF9wYXJlbnRfcGF0aF9tYXRjaGluZ19jYWxs YmFja19jb25kaXRpb25fd2l0aF9maWxlX3N5c3RlbShzZWxmKToKLSAgICAgICAgaG9zdCA9IFN0 dWJSZXBvc2l0b3J5VGVzdC5tb2NrX2hvc3RfZm9yX3N0dWJfcmVwb3NpdG9yeSgpCi0gICAgICAg IHNlbGYuYXNzZXJ0SXNOb25lKFN0dWJSZXBvc2l0b3J5Ll9maW5kX3BhcmVudF9wYXRoX21hdGNo aW5nX2NhbGxiYWNrX2NvbmRpdGlvbihwYXRoPWhvc3Quam9pbignVGVzdERpcmVjdG9yeScpLCBj YWxsYmFjaz1sYW1iZGEgcGF0aDogVHJ1ZSwgZmlsZXN5c3RlbT1ob3N0KSkKKyAgICAgICAgZmls ZXN5c3RlbSA9IFN0dWJSZXBvc2l0b3J5VGVzdC5tb2NrX2ZpbGVzeXN0ZW1fZm9yX3N0dWJfcmVw b3NpdG9yeSgpCisgICAgICAgIHNlbGYuYXNzZXJ0SXNOb25lKFN0dWJSZXBvc2l0b3J5Ll9maW5k X3BhcmVudF9wYXRoX21hdGNoaW5nX2NhbGxiYWNrX2NvbmRpdGlvbihwYXRoPWZpbGVzeXN0ZW0u am9pbignVGVzdERpcmVjdG9yeScpLCBjYWxsYmFjaz1sYW1iZGEgcGF0aDogVHJ1ZSwgZmlsZXN5 c3RlbT1maWxlc3lzdGVtKSkKIAogICAgIGRlZiB0ZXN0X2ZpbmRfcGFyZW50X3BhdGhfbWF0Y2hp bmdfY2FsbGJhY2tfY29uZGl0aW9uX3dpdGhvdXRfZmlsZV9zeXN0ZW0oc2VsZik6CiAgICAgICAg IHNlbGYuYXNzZXJ0SXNOb25lKFN0dWJSZXBvc2l0b3J5Ll9maW5kX3BhcmVudF9wYXRoX21hdGNo aW5nX2NhbGxiYWNrX2NvbmRpdGlvbihwYXRoPScvVm9sdW1lcy8nLCBjYWxsYmFjaz1sYW1iZGEg cGF0aDogVHJ1ZSwgZmlsZXN5c3RlbT1Ob25lKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzX3VuaXR0ZXN0LnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jl c3VsdHNfdW5pdHRlc3QucHkKaW5kZXggZDVhY2IwZTNiNmQyNzkxMjFlYmExOGJmMmE2ODZlOTlk NGY4ODgyOC4uMDk1MDFhYWQ1OTE4ZTdmOTNhNDM5N2YwZTZkMzNjNWRjNTJhYjZkMiAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVu X3Jlc3VsdHNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHNfdW5pdHRlc3QucHkKQEAgLTE1NCwxMSArMTU0 LDE2IEBAIGNsYXNzIFN1bW1hcml6ZWRSZXN1bHRzVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAg ICAgICAgIHN1bW1hcnkgPSBzdW1tYXJpemVkX3Jlc3VsdHMoc2VsZi5wb3J0LCBleHBlY3RlZD1G YWxzZSwgcGFzc2luZz1GYWxzZSwgZmxha3k9RmFsc2UpCiAgICAgICAgIHNlbGYuYXNzZXJ0Tm90 SW4oJ3JldmlzaW9uJywgc3VtbWFyeSkKIAotICAgIGRlZiB0ZXN0X3N2bl9yZXZpc2lvbihzZWxm KToKKyAgICBkZWYgdGVzdF9zdm5fcmV2aXNpb25fZXhpc3RzKHNlbGYpOgogICAgICAgICBzZWxm LnBvcnQuX29wdGlvbnMuYnVpbGRlcl9uYW1lID0gJ2R1bW15IGJ1aWxkZXInCiAgICAgICAgIHN1 bW1hcnkgPSBzdW1tYXJpemVkX3Jlc3VsdHMoc2VsZi5wb3J0LCBleHBlY3RlZD1GYWxzZSwgcGFz c2luZz1GYWxzZSwgZmxha3k9RmFsc2UpCiAgICAgICAgIHNlbGYuYXNzZXJ0Tm90RXF1YWxzKHN1 bW1hcnlbJ3JldmlzaW9uJ10sICcnKQogCisgICAgZGVmIHRlc3Rfc3ZuX3JldmlzaW9uKHNlbGYp OgorICAgICAgICBzZWxmLnBvcnQuX29wdGlvbnMuYnVpbGRlcl9uYW1lID0gJ2R1bW15IGJ1aWxk ZXInCisgICAgICAgIHN1bW1hcnkgPSBzdW1tYXJpemVkX3Jlc3VsdHMoc2VsZi5wb3J0LCBleHBl Y3RlZD1GYWxzZSwgcGFzc2luZz1GYWxzZSwgZmxha3k9RmFsc2UpCisgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWxzKHN1bW1hcnlbJ3JldmlzaW9uJ10sICcyNzM4NDk5JykKKwogICAgIGRlZiB0ZXN0 X3N1bW1hcml6ZWRfcmVzdWx0c193b250Zml4KHNlbGYpOgogICAgICAgICBzZWxmLnBvcnQuX29w dGlvbnMuYnVpbGRlcl9uYW1lID0gJ2R1bW15IGJ1aWxkZXInCiAgICAgICAgIHN1bW1hcnkgPSBz dW1tYXJpemVkX3Jlc3VsdHMoc2VsZi5wb3J0LCBleHBlY3RlZD1GYWxzZSwgcGFzc2luZz1GYWxz ZSwgZmxha3k9RmFsc2UpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQv YmFzZV91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlX3VuaXR0 ZXN0LnB5CmluZGV4IDVkZjFjYzU1MDY5ZTJhN2JmMGU3ZjY3ZDkyZGQ3OTg3YTRiNzYyZmUuLjdh MTg4YTIyZWFkMzk4YTBmOTc5OTM4MDI2ZDZjYzk5MWY0OGE2MTEgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5CkBAIC0zNiw2ICszNiw3IEBAIGZyb20g d2Via2l0cHkuY29tbW9uLnN5c3RlbS5maWxlc3lzdGVtX21vY2sgaW1wb3J0IE1vY2tGaWxlU3lz dGVtCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0ub3V0cHV0Y2FwdHVyZSBpbXBvcnQgT3V0 cHV0Q2FwdHVyZQogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZV9tb2NrIGlt cG9ydCBNb2NrRXhlY3V0aXZlMgogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLnN5c3RlbWhv c3RfbW9jayBpbXBvcnQgTW9ja1N5c3RlbUhvc3QKK2Zyb20gd2Via2l0cHkuY29tbW9uLmhvc3Rf bW9jayBpbXBvcnQgTW9ja0hvc3QKIAogZnJvbSB3ZWJraXRweS5wb3J0IGltcG9ydCBQb3J0CiBm cm9tIHdlYmtpdHB5LnBvcnQudGVzdCBpbXBvcnQgYWRkX3VuaXRfdGVzdHNfdG9fbW9ja19maWxl c3lzdGVtLCBUZXN0UG9ydApAQCAtNDYsNyArNDcsNyBAQCBkZWYgY21wKGEsIGIpOgogCiBjbGFz cyBQb3J0VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIG1ha2VfcG9ydChzZWxmLCBl eGVjdXRpdmU9Tm9uZSwgd2l0aF90ZXN0cz1GYWxzZSwgcG9ydF9uYW1lPU5vbmUsICoqa3dhcmdz KToKLSAgICAgICAgaG9zdCA9IE1vY2tTeXN0ZW1Ib3N0KCkKKyAgICAgICAgaG9zdCA9IE1vY2tI b3N0KGNyZWF0ZV9zdHViX3JlcG9zaXRvcnlfZmlsZXM9VHJ1ZSkKICAgICAgICAgaWYgZXhlY3V0 aXZlOgogICAgICAgICAgICAgaG9zdC5leGVjdXRpdmUgPSBleGVjdXRpdmUKICAgICAgICAgaWYg d2l0aF90ZXN0czoKQEAgLTQzNSw2ICs0MzYsMTAgQEAgY2xhc3MgUG9ydFRlc3QodW5pdHRlc3Qu VGVzdENhc2UpOgogICAgICAgICAgICAgcG9ydC5yZWZlcmVuY2VfZmlsZXMoJ2Zhc3QvcmVmLmh0 bWwnKSwKICAgICAgICAgKQogCisgICAgZGVmIHRlc3RfY29tbWl0c19mb3JfdXBsb2FkKHNlbGYp OgorICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQocG9ydF9uYW1lPSdmb28nKQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKFt7J3JlcG9zaXRvcnlfaWQnOiAnd2Via2l0JywgJ2lkJzogJzI3 Mzg0OTknLCAnYnJhbmNoJzogJ3RydW5rJ31dLCBwb3J0LmNvbW1pdHNfZm9yX3VwbG9hZCgpKQor CiAKIGNsYXNzIE5hdHVyYWxDb21wYXJlVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVm IHNldFVwKHNlbGYpOgo= 392308 2020-03-03 12:20:10 -0800 2020-03-03 12:50:30 -0800 Patch bug-208485-20200303122009.patch text/plain 12579 jlewis3 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3NzkzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmM4NzQ0MTUwNTA2MDQ3M2MzNDYyZTg3NDI3MDZhY2M1 MGRhZWU4ZS4uNjU1ZTFkNTQ3OTljOGI1NjY2MTNmOGQ1YzE2YmQwMDYyNzQxOGU1NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2 IEBACisyMDIwLTAzLTAzICBNYXR0IExld2lzICA8amxld2lzM0BhcHBsZS5jb20+CisKKyAgICAg ICAgQWRkIFVuaXR0ZXN0IHRvIGNvbW1pdHNfZm9yX3VwbG9hZCgpIGFuZCBmaXggbXVsdGlwbGUg dW5pdHRlc3RzIGZvciBzZXZlcmFsIHRlc3Qgc3VpdGVzLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4NDg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9zY20vc3R1Yl9yZXBvc2l0b3J5LnB5OgorICAgICAgICAoU3R1YlJlcG9zaXRvcnkuX19p bml0X18pOiBGaXhpbmcgdGhlIGNvbnN0cnVjdG9yIHRvIGNhbGwgdXBvbiB0aGUgcGFyZW50IGNs YXNzIGFzIHdlIHdlcmUgbm90IGRvaW5nIHRoaXMgYmVmb3JlLiBJdCBhbHNvIG1lYW5zCisgICAg ICAgIHRoYXQgd2UgZG9uJ3QgaGF2ZSB0byByZWNyZWF0ZSB0aGUgdmFyaWFibGVzIHRoYXQgYXJl IGFscmVhZHkgY3JlYXRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9zY20vc3R1Yl9yZXBvc2l0b3J5X3VuaXR0ZXN0LnB5OiBIaWdoIGxldmVsIGNoYW5nZWQg dGhlIGltcG9ydHMgdG8gYmV0dGVyIHJlZmxlY3Qgd2hhdCB3ZSBhcmUgdXNpbmcKKyAgICAgICAg ZnJvbSBlYWNoIG1vZHVsZSwgcmF0aGVyIHRoYW4gbWFraW5nIGV4dHJhIGltcG9ydHMgdGhhdCB3 ZSBkb24ndCBuZWVkLgorICAgICAgICAoU3R1YlJlcG9zaXRvcnlUZXN0Lm1vY2tfaG9zdF9mb3Jf c3R1Yl9yZXBvc2l0b3J5KTogU2luY2Ugd2UgYXJlIGNhbGxpbmcgYm90aCBhbiBleGVjdXRpdmUg YW5kIGEgZmlsZXN5c3RlbSBtb2NrIGZvciBtb3N0IG9mIHRoZQorICAgICAgICB0ZXN0cy4gaXQg bWFrZXMgbW9yZSBzZW5zZSB0byBjcmVhdGUgYSBtb2NrIGhvc3Qgd2l0aCB0aGUgZmlsZXMgbmVl ZGVkLCB0aGFuIGl0IGRvZXMgdG8gaW5zdGFudGlhdGUgZWFjaCBvZiB0aGVzZSBhcyBzZXBhcmF0 ZSBvYmplY3RzCisgICAgICAgIGFuZCBub3QgcGFydCBvZiB0aGUgaG9zdC4KKyAgICAgICAgKFN0 dWJSZXBvc2l0b3J5VGVzdC50ZXN0X2luX3dvcmtpbmdfZGlyZWN0b3J5KTogQ2hhbmdlZCB0aGUg ZmlsZXN5c3RlbSBjYWxsIHRvIHRoZSBob3N0IGNhbGwuCisgICAgICAgIChTdHViUmVwb3NpdG9y eVRlc3QudGVzdF9uYXRpdmVfcmV2aXNpb24pOiBDaGFuZ2VkIHRoZSBmaWxlc3lzdGVtIGNhbGwg dG8gdGhlIGhvc3QgY2FsbC4KKyAgICAgICAgKFN0dWJSZXBvc2l0b3J5VGVzdC50ZXN0X25hdGl2 ZV9icmFuY2gpOiBDaGFuZ2VkIHRoZSBmaWxlc3lzdGVtIGNhbGwgdG8gdGhlIGhvc3QgY2FsbC4K KyAgICAgICAgKFN0dWJSZXBvc2l0b3J5VGVzdC50ZXN0X3N2bl9yZXZpc2lvbik6IENoYW5nZWQg dGhlIGZpbGVzeXN0ZW0gY2FsbCB0byB0aGUgaG9zdCBjYWxsLgorICAgICAgICAoU3R1YlJlcG9z aXRvcnlUZXN0LnRlc3RfZmluZF9jaGVja291dF9yb290KTogQ2hhbmdlZCB0aGUgZmlsZXN5c3Rl bSBjYWxsIHRvIHRoZSBob3N0IGNhbGwuCisgICAgICAgIChTdHViUmVwb3NpdG9yeVRlc3QudGVz dF9maW5kX2NoZWNrb3V0X3Jvb3RfZmFpbHVyZSk6IENoYW5nZWQgdGhlIGZpbGVzeXN0ZW0gY2Fs bCB0byB0aGUgaG9zdCBjYWxsLgorICAgICAgICAoU3R1YlJlcG9zaXRvcnlUZXN0LnRlc3RfZmlu ZF9wYXJlbnRfcGF0aF9tYXRjaGluZ19jYWxsYmFja19jb25kaXRpb25fd2l0aF9maWxlX3N5c3Rl bSk6IENoYW5nZWQgdGhlIGZpbGVzeXN0ZW0gY2FsbCB0byB0aGUgaG9zdCBjYWxsLgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRz X3VuaXR0ZXN0LnB5OiAKKyAgICAgICAgKFN1bW1hcml6ZWRSZXN1bHRzVGVzdC50ZXN0X3N2bl9y ZXZpc2lvbl9leGlzdHMpOiBDaGFuZ2VkIHRoZSBuYW1lIHRvIG9yaWdpbmFsIHRlc3QgdG8gYmV0 dGVyIHJlZmxlY3QgdGhhdCBpdCB3YXMganVzdCBsb29raW5nIHRvIHNlZQorICAgICAgICBpZiB3 ZSB3ZXJlIGdldGluZyBhbnkgdmFsdWUgYXQgYWxsCisgICAgICAgIChTdW1tYXJpemVkUmVzdWx0 c1Rlc3QudGVzdF9zdm5fcmV2aXNpb24pOiBBZGRlZCBhIHRlc3QgdG8gbWFrZSBzdXJlIHRoYXQg dGhlIHJldmlzaW9uIHdlIGFyZSBnZXR0aW5nIGlzIHdoYXQgd2UgZXhwZWN0IHRvIGdldCBhbmQg bWFrZQorICAgICAgICBzdXJlIHdlIGFyZW4ndCBnYWJraW5nIHRoZSB3cm9uZyBrZXk6dmFsdWUg cGFpcgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5OiBD aGFuZ2VkIGZyb20gTW9ja1N5c3RlbUhvc3QgdG8gTW9ja0hvc3QgYXMgd2Ugd2FudCB0aGUgZXh0 cmFzIHRoYXQKKyAgICAgICAgY29tZSB3aXRoIHRoZSBNb2NrSG9zdHMgYW5kIE1vY2tIb3N0IGlu aGVyaXRzIGZyb20gTW9ja1N5c3RlbUhvc3QuCisgICAgICAgIChQb3J0VGVzdC5tYWtlX3BvcnQp OiBDaGFuZ2VkIHRoZSBwb3J0IHRvIGNhbGwgTW9ja0hvc3QgdGhhdCB3aWxsIGNyZWF0IHRoZSBy ZXF1aXJlZCBzdHViX3JlcG9zaXRvcnkgZmlsZXMuCisgICAgICAgICh0ZXN0X2NvbW1pdHNfZm9y X3VwbG9hZCk6IEFkZGVkIGFtaXNzaW5nIHRlc3QgZm9yIGNvbW1pdHNfZm9yX3VwbG9hZCBhcyB0 aGlzIGhhcyBiZWVuIGFuIGlzc3VlIHdoZW4gdHJ5aW5nIHRvIG1ha2UgY2hhbmdlcworICAgICAg ICB0byB0aGUgdmFyaW91cyB1cGxvYWQgc3RlcHMuCisKIDIwMjAtMDMtMDMgIFJ5YW4gSGFkZGFk ICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPUyBFV1NdIFRlc3RXZWJLaXRB UEkuV0tXZWJzaXRlRGF0YVN0b3JlLlJlbW92ZUFuZEZldGNoRGF0YSBpcyBmYWlsaW5nCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3R1Yl9y ZXBvc2l0b3J5LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2Nt L3N0dWJfcmVwb3NpdG9yeS5weQppbmRleCAzYmI5MWUyYmI3YTdkYWVkMjdhMGQyYjZjZDRmMWM1 MTNkYmNlZGNhLi5jZTQ5ZTFhNGRkOTkzNGYwNTQxMDc2N2EzYzgxOTBiZmQ1NDIyZTU2IDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3R1Yl9y ZXBvc2l0b3J5LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0 L3NjbS9zdHViX3JlcG9zaXRvcnkucHkKQEAgLTM3LDEwICszNyw4IEBAIF9sb2cgPSBsb2dnaW5n LmdldExvZ2dlcihfX25hbWVfXykKIGNsYXNzIFN0dWJSZXBvc2l0b3J5KFNDTSk6CiAgICAgX3N0 dWJfcmVwb3NpdG9yeV9qc29uID0gJ2NoZWNrb3V0X2luZm9ybWF0aW9uLmpzb24nCiAKLSAgICBk ZWYgX19pbml0X18oc2VsZiwgY3dkLCBmaWxlc3lzdGVtLCAqKmt3YXJncyk6Ci0gICAgICAgICMg V2UgY3JlYXRlIG91ciBvd24gY2hlY2tvdXQgcm9vdCBhbmQgZmlsZXN5c3RlbSBoZXJlIGJlY2F1 c2Ugd2UgYXJlIHdvcmtpbmcgYXJvdW5kIHRoZSBmYWN0IHRoYXQgd2UgZG9uJ3QgaGF2ZSBhbmQg YWN0dWFsIFNDTSBzY2hlbWUuCi0gICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0gPSBmaWxlc3lzdGVt Ci0gICAgICAgIHNlbGYuY2hlY2tvdXRfcm9vdCA9IHNlbGYuZmluZF9jaGVja291dF9yb290KGN3 ZCkKKyAgICBkZWYgX19pbml0X18oc2VsZiwgY3dkLCBwYXRjaF9kaXJlY3Rvcmllcz1Ob25lLCAq Kmt3YXJncyk6CisgICAgICAgIFNDTS5fX2luaXRfXyhzZWxmLCBjd2QsICoqa3dhcmdzKQogCiAg ICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIF9maW5kX3BhcmVudF9wYXRoX21hdGNoaW5nX2NhbGxi YWNrX2NvbmRpdGlvbihjbHMsIHBhdGgsIGNhbGxiYWNrLCBmaWxlc3lzdGVtPU5vbmUpOgpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N0dWJf cmVwb3NpdG9yeV91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L3NjbS9zdHViX3JlcG9zaXRvcnlfdW5pdHRlc3QucHkKaW5kZXggNDI2ZGYxYjZmNzIy YzA5OTgxMmRmZGU4YzE3MDcyY2QxOTViYjgyMy4uZGNiNGIxYjg3MTk0ZDI0Mjc3ZjUxMDUxZGU3 ZmViNjQyOGJkNTIzMSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y2hlY2tvdXQvc2NtL3N0dWJfcmVwb3NpdG9yeV91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3R1Yl9yZXBvc2l0b3J5X3VuaXR0ZXN0 LnB5CkBAIC0yMiw3ICsyMiw5IEBACiAKIGltcG9ydCB1bml0dGVzdAogCi1mcm9tIHdlYmtpdHB5 LmNvbW1vbi5zeXN0ZW0gaW1wb3J0IGZpbGVzeXN0ZW1fbW9jaworZnJvbSB3ZWJraXRweS5jb21t b24uc3lzdGVtLmZpbGVzeXN0ZW1fbW9jayBpbXBvcnQgTW9ja0ZpbGVTeXN0ZW0KK2Zyb20gd2Vi a2l0cHkuY29tbW9uLnN5c3RlbS5leGVjdXRpdmVfbW9jayBpbXBvcnQgTW9ja0V4ZWN1dGl2ZQor ZnJvbSB3ZWJraXRweS5jb21tb24uaG9zdF9tb2NrIGltcG9ydCBNb2NrSG9zdAogZnJvbSB3ZWJr aXRweS5jb21tb24uY2hlY2tvdXQuc2NtLnN0dWJfcmVwb3NpdG9yeSBpbXBvcnQgU3R1YlJlcG9z aXRvcnkKIAogbW9ja19zdHViX3JlcG9zaXRvcnlfanNvbiA9IHsnYnJhbmNoJzogJ3RydW5rJywg J2lkJzogJzI3Mzg0OTknfQpAQCAtMzgsNDEgKzQwLDQzIEBAIGNsYXNzIFN0dWJSZXBvc2l0b3J5 VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAKICAgICBAc3RhdGljbWV0aG9kCiAgICAgZGVmIG1v Y2tfaG9zdF9mb3Jfc3R1Yl9yZXBvc2l0b3J5KCk6Ci0gICAgICAgIGhvc3QgPSBmaWxlc3lzdGVt X21vY2suTW9ja0ZpbGVTeXN0ZW0oZmlsZXM9RkFLRV9GSUxFUykKKyAgICAgICAgaG9zdCA9IE1v Y2tIb3N0KGNyZWF0ZV9zdHViX3JlcG9zaXRvcnlfZmlsZXM9VHJ1ZSkKKyAgICAgICAgaG9zdC5m aWxlc3lzdGVtID0gTW9ja0ZpbGVTeXN0ZW0oZmlsZXM9RkFLRV9GSUxFUykKKyAgICAgICAgaG9z dC5leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlKCkKICAgICAgICAgcmV0dXJuIGhvc3QKIAogICAg IGRlZiB0ZXN0X2luX3dvcmtpbmdfZGlyZWN0b3J5KHNlbGYpOgogICAgICAgICBob3N0ID0gU3R1 YlJlcG9zaXRvcnlUZXN0Lm1vY2tfaG9zdF9mb3Jfc3R1Yl9yZXBvc2l0b3J5KCkKLSAgICAgICAg c2VsZi5hc3NlcnRUcnVlKFN0dWJSZXBvc2l0b3J5LmluX3dvcmtpbmdfZGlyZWN0b3J5KHBhdGg9 aG9zdC5qb2luKGhvc3QuZ2V0Y3dkKCksICdUZXN0RGlyZWN0b3J5JywgJ1Rlc3REaXJlY3Rvcnky JywgJ1Rlc3REaXJlY3RvcnkzJyksIGZpbGVzeXN0ZW09aG9zdCkpCisgICAgICAgIHNlbGYuYXNz ZXJ0VHJ1ZShTdHViUmVwb3NpdG9yeS5pbl93b3JraW5nX2RpcmVjdG9yeShwYXRoPWhvc3QuZmls ZXN5c3RlbS5qb2luKGhvc3QuZmlsZXN5c3RlbS5nZXRjd2QoKSwgJ1Rlc3REaXJlY3RvcnknLCAn VGVzdERpcmVjdG9yeTInLCAnVGVzdERpcmVjdG9yeTMnKSwgZmlsZXN5c3RlbT1ob3N0LmZpbGVz eXN0ZW0pKQogCiAgICAgZGVmIHRlc3RfbmF0aXZlX3JldmlzaW9uKHNlbGYpOgogICAgICAgICBo b3N0ID0gU3R1YlJlcG9zaXRvcnlUZXN0Lm1vY2tfaG9zdF9mb3Jfc3R1Yl9yZXBvc2l0b3J5KCkK LSAgICAgICAgcmVwb3NpdG9yeSA9IFN0dWJSZXBvc2l0b3J5KGN3ZD1ob3N0LmdldGN3ZCgpLCBm aWxlc3lzdGVtPWhvc3QpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVwb3NpdG9yeS5uYXRp dmVfcmV2aXNpb24ocGF0aD1ob3N0LmpvaW4oaG9zdC5nZXRjd2QoKSwgJ1Rlc3REaXJlY3Rvcnkn LCAnVGVzdERpcmVjdG9yeTInLCAnVGVzdERpcmVjdG9yeTMnKSksIG1vY2tfc3R1Yl9yZXBvc2l0 b3J5X2pzb25bJ2lkJ10pCisgICAgICAgIHJlcG9zaXRvcnkgPSBTdHViUmVwb3NpdG9yeShjd2Q9 aG9zdC5maWxlc3lzdGVtLmdldGN3ZCgpLCBmaWxlc3lzdGVtPWhvc3QuZmlsZXN5c3RlbSwgZXhl Y3V0aXZlPWhvc3QuZXhlY3V0aXZlKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJlcG9zaXRv cnkubmF0aXZlX3JldmlzaW9uKHBhdGg9aG9zdC5maWxlc3lzdGVtLmpvaW4oaG9zdC5maWxlc3lz dGVtLmdldGN3ZCgpLCAnVGVzdERpcmVjdG9yeScsICdUZXN0RGlyZWN0b3J5MicsICdUZXN0RGly ZWN0b3J5MycpKSwgbW9ja19zdHViX3JlcG9zaXRvcnlfanNvblsnaWQnXSkKIAogICAgIGRlZiB0 ZXN0X25hdGl2ZV9icmFuY2goc2VsZik6CiAgICAgICAgIGhvc3QgPSBTdHViUmVwb3NpdG9yeVRl c3QubW9ja19ob3N0X2Zvcl9zdHViX3JlcG9zaXRvcnkoKQotICAgICAgICByZXBvc2l0b3J5ID0g U3R1YlJlcG9zaXRvcnkoY3dkPWhvc3QuZ2V0Y3dkKCksIGZpbGVzeXN0ZW09aG9zdCkKLSAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChyZXBvc2l0b3J5Lm5hdGl2ZV9icmFuY2gocGF0aD1ob3N0Lmpv aW4oaG9zdC5nZXRjd2QoKSwgJ1Rlc3REaXJlY3RvcnknLCAnVGVzdERpcmVjdG9yeTInLCAnVGVz dERpcmVjdG9yeTMnKSksIG1vY2tfc3R1Yl9yZXBvc2l0b3J5X2pzb25bJ2JyYW5jaCddKQorICAg ICAgICByZXBvc2l0b3J5ID0gU3R1YlJlcG9zaXRvcnkoY3dkPWhvc3QuZmlsZXN5c3RlbS5nZXRj d2QoKSwgZmlsZXN5c3RlbT1ob3N0LmZpbGVzeXN0ZW0sIGV4ZWN1dGl2ZT1ob3N0LmV4ZWN1dGl2 ZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChyZXBvc2l0b3J5Lm5hdGl2ZV9icmFuY2gocGF0 aD1ob3N0LmZpbGVzeXN0ZW0uam9pbihob3N0LmZpbGVzeXN0ZW0uZ2V0Y3dkKCksICdUZXN0RGly ZWN0b3J5JywgJ1Rlc3REaXJlY3RvcnkyJywgJ1Rlc3REaXJlY3RvcnkzJykpLCBtb2NrX3N0dWJf cmVwb3NpdG9yeV9qc29uWydicmFuY2gnXSkKIAogICAgIGRlZiB0ZXN0X3N2bl9yZXZpc2lvbihz ZWxmKToKICAgICAgICAgaG9zdCA9IFN0dWJSZXBvc2l0b3J5VGVzdC5tb2NrX2hvc3RfZm9yX3N0 dWJfcmVwb3NpdG9yeSgpCi0gICAgICAgIHJlcG9zaXRvcnkgPSBTdHViUmVwb3NpdG9yeShjd2Q9 aG9zdC5nZXRjd2QoKSwgZmlsZXN5c3RlbT1ob3N0KQotICAgICAgICBzZWxmLmFzc2VydEVxdWFs KHJlcG9zaXRvcnkuc3ZuX3JldmlzaW9uKHBhdGg9aG9zdC5qb2luKGhvc3QuZ2V0Y3dkKCksICdU ZXN0RGlyZWN0b3J5JywgJ1Rlc3REaXJlY3RvcnkyJywgJ1Rlc3REaXJlY3RvcnkzJykpLCBtb2Nr X3N0dWJfcmVwb3NpdG9yeV9qc29uWydpZCddKQorICAgICAgICByZXBvc2l0b3J5ID0gU3R1YlJl cG9zaXRvcnkoY3dkPWhvc3QuZmlsZXN5c3RlbS5nZXRjd2QoKSwgZmlsZXN5c3RlbT1ob3N0LmZp bGVzeXN0ZW0sIGV4ZWN1dGl2ZT1ob3N0LmV4ZWN1dGl2ZSkKKyAgICAgICAgc2VsZi5hc3NlcnRF cXVhbChyZXBvc2l0b3J5LnN2bl9yZXZpc2lvbihwYXRoPWhvc3QuZmlsZXN5c3RlbS5qb2luKGhv c3QuZmlsZXN5c3RlbS5nZXRjd2QoKSwgJ1Rlc3REaXJlY3RvcnknLCAnVGVzdERpcmVjdG9yeTIn LCAnVGVzdERpcmVjdG9yeTMnKSksIG1vY2tfc3R1Yl9yZXBvc2l0b3J5X2pzb25bJ2lkJ10pCiAK ICAgICBkZWYgdGVzdF9maW5kX2NoZWNrb3V0X3Jvb3Qoc2VsZik6CiAgICAgICAgIGhvc3QgPSBT dHViUmVwb3NpdG9yeVRlc3QubW9ja19ob3N0X2Zvcl9zdHViX3JlcG9zaXRvcnkoKQotICAgICAg ICByZXBvc2l0b3J5ID0gU3R1YlJlcG9zaXRvcnkoY3dkPWhvc3QuZ2V0Y3dkKCksIGZpbGVzeXN0 ZW09aG9zdCkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocmVwb3NpdG9yeS5maW5kX2NoZWNr b3V0X3Jvb3QocGF0aD1ob3N0LmpvaW4oJ1Rlc3REaXJlY3RvcnknLCAnVGVzdERpcmVjdG9yeTIn LCAnVGVzdERpcmVjdG9yeTMnKSksIGhvc3Quam9pbihob3N0LmdldGN3ZCgpLCAnVGVzdERpcmVj dG9yeScsICdUZXN0RGlyZWN0b3J5MicpKQorICAgICAgICByZXBvc2l0b3J5ID0gU3R1YlJlcG9z aXRvcnkoY3dkPWhvc3QuZmlsZXN5c3RlbS5nZXRjd2QoKSwgZmlsZXN5c3RlbT1ob3N0LmZpbGVz eXN0ZW0sIGV4ZWN1dGl2ZT1ob3N0LmV4ZWN1dGl2ZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bHMocmVwb3NpdG9yeS5maW5kX2NoZWNrb3V0X3Jvb3QocGF0aD1ob3N0LmZpbGVzeXN0ZW0uam9p bignVGVzdERpcmVjdG9yeScsICdUZXN0RGlyZWN0b3J5MicsICdUZXN0RGlyZWN0b3J5MycpKSwg aG9zdC5maWxlc3lzdGVtLmpvaW4oaG9zdC5maWxlc3lzdGVtLmdldGN3ZCgpLCAnVGVzdERpcmVj dG9yeScsICdUZXN0RGlyZWN0b3J5MicpKQogCiAgICAgZGVmIHRlc3RfZmluZF9jaGVja291dF9y b290X2ZhaWx1cmUoc2VsZik6CiAgICAgICAgIGhvc3QgPSBTdHViUmVwb3NpdG9yeVRlc3QubW9j a19ob3N0X2Zvcl9zdHViX3JlcG9zaXRvcnkoKQotICAgICAgICByZXBvc2l0b3J5ID0gU3R1YlJl cG9zaXRvcnkoY3dkPWhvc3QuZ2V0Y3dkKCksIGZpbGVzeXN0ZW09aG9zdCkKLSAgICAgICAgc2Vs Zi5hc3NlcnRJc05vbmUocmVwb3NpdG9yeS5maW5kX2NoZWNrb3V0X3Jvb3QocGF0aD1ob3N0Lmdl dGN3ZCgpKSkKKyAgICAgICAgcmVwb3NpdG9yeSA9IFN0dWJSZXBvc2l0b3J5KGN3ZD1ob3N0LmZp bGVzeXN0ZW0uZ2V0Y3dkKCksIGZpbGVzeXN0ZW09aG9zdC5maWxlc3lzdGVtLCBleGVjdXRpdmU9 aG9zdC5leGVjdXRpdmUpCisgICAgICAgIHNlbGYuYXNzZXJ0SXNOb25lKHJlcG9zaXRvcnkuZmlu ZF9jaGVja291dF9yb290KHBhdGg9aG9zdC5maWxlc3lzdGVtLmdldGN3ZCgpKSkKIAogICAgIGRl ZiB0ZXN0X2ZpbmRfcGFyZW50X3BhdGhfbWF0Y2hpbmdfY2FsbGJhY2tfY29uZGl0aW9uX3dpdGhf ZmlsZV9zeXN0ZW0oc2VsZik6CiAgICAgICAgIGhvc3QgPSBTdHViUmVwb3NpdG9yeVRlc3QubW9j a19ob3N0X2Zvcl9zdHViX3JlcG9zaXRvcnkoKQotICAgICAgICBzZWxmLmFzc2VydElzTm9uZShT dHViUmVwb3NpdG9yeS5fZmluZF9wYXJlbnRfcGF0aF9tYXRjaGluZ19jYWxsYmFja19jb25kaXRp b24ocGF0aD1ob3N0LmpvaW4oJ1Rlc3REaXJlY3RvcnknKSwgY2FsbGJhY2s9bGFtYmRhIHBhdGg6 IFRydWUsIGZpbGVzeXN0ZW09aG9zdCkpCisgICAgICAgIHNlbGYuYXNzZXJ0SXNOb25lKFN0dWJS ZXBvc2l0b3J5Ll9maW5kX3BhcmVudF9wYXRoX21hdGNoaW5nX2NhbGxiYWNrX2NvbmRpdGlvbihw YXRoPWhvc3QuZmlsZXN5c3RlbS5qb2luKCdUZXN0RGlyZWN0b3J5JyksIGNhbGxiYWNrPWxhbWJk YSBwYXRoOiBUcnVlLCBmaWxlc3lzdGVtPWhvc3QuZmlsZXN5c3RlbSkpCiAKICAgICBkZWYgdGVz dF9maW5kX3BhcmVudF9wYXRoX21hdGNoaW5nX2NhbGxiYWNrX2NvbmRpdGlvbl93aXRob3V0X2Zp bGVfc3lzdGVtKHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydElzTm9uZShTdHViUmVwb3NpdG9y eS5fZmluZF9wYXJlbnRfcGF0aF9tYXRjaGluZ19jYWxsYmFja19jb25kaXRpb24ocGF0aD0nL1Zv bHVtZXMvJywgY2FsbGJhY2s9bGFtYmRhIHBhdGg6IFRydWUsIGZpbGVzeXN0ZW09Tm9uZSkpCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVz dF9ydW5fcmVzdWx0c191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzX3VuaXR0ZXN0LnB5CmluZGV4IGQ1YWNiMGUz YjZkMjc5MTIxZWJhMThiZjJhNjg2ZTk5ZDRmODg4MjguLjA5NTAxYWFkNTkxOGU3ZjkzYTQzOTdm MGU2ZDMzYzVkYzUyYWI2ZDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzX3Vu aXR0ZXN0LnB5CkBAIC0xNTQsMTEgKzE1NCwxNiBAQCBjbGFzcyBTdW1tYXJpemVkUmVzdWx0c1Rl c3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzdW1tYXJ5ID0gc3VtbWFyaXplZF9yZXN1 bHRzKHNlbGYucG9ydCwgZXhwZWN0ZWQ9RmFsc2UsIHBhc3Npbmc9RmFsc2UsIGZsYWt5PUZhbHNl KQogICAgICAgICBzZWxmLmFzc2VydE5vdEluKCdyZXZpc2lvbicsIHN1bW1hcnkpCiAKLSAgICBk ZWYgdGVzdF9zdm5fcmV2aXNpb24oc2VsZik6CisgICAgZGVmIHRlc3Rfc3ZuX3JldmlzaW9uX2V4 aXN0cyhzZWxmKToKICAgICAgICAgc2VsZi5wb3J0Ll9vcHRpb25zLmJ1aWxkZXJfbmFtZSA9ICdk dW1teSBidWlsZGVyJwogICAgICAgICBzdW1tYXJ5ID0gc3VtbWFyaXplZF9yZXN1bHRzKHNlbGYu cG9ydCwgZXhwZWN0ZWQ9RmFsc2UsIHBhc3Npbmc9RmFsc2UsIGZsYWt5PUZhbHNlKQogICAgICAg ICBzZWxmLmFzc2VydE5vdEVxdWFscyhzdW1tYXJ5WydyZXZpc2lvbiddLCAnJykKIAorICAgIGRl ZiB0ZXN0X3N2bl9yZXZpc2lvbihzZWxmKToKKyAgICAgICAgc2VsZi5wb3J0Ll9vcHRpb25zLmJ1 aWxkZXJfbmFtZSA9ICdkdW1teSBidWlsZGVyJworICAgICAgICBzdW1tYXJ5ID0gc3VtbWFyaXpl ZF9yZXN1bHRzKHNlbGYucG9ydCwgZXhwZWN0ZWQ9RmFsc2UsIHBhc3Npbmc9RmFsc2UsIGZsYWt5 PUZhbHNlKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzdW1tYXJ5WydyZXZpc2lvbiddLCAn MjczODQ5OScpCisKICAgICBkZWYgdGVzdF9zdW1tYXJpemVkX3Jlc3VsdHNfd29udGZpeChzZWxm KToKICAgICAgICAgc2VsZi5wb3J0Ll9vcHRpb25zLmJ1aWxkZXJfbmFtZSA9ICdkdW1teSBidWls ZGVyJwogICAgICAgICBzdW1tYXJ5ID0gc3VtbWFyaXplZF9yZXN1bHRzKHNlbGYucG9ydCwgZXhw ZWN0ZWQ9RmFsc2UsIHBhc3Npbmc9RmFsc2UsIGZsYWt5PUZhbHNlKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2VfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3BvcnQvYmFzZV91bml0dGVzdC5weQppbmRleCA1ZGYxY2M1NTA2OWUyYTdiZjBl N2Y2N2Q5MmRkNzk4N2E0Yjc2MmZlLi43YTE4OGEyMmVhZDM5OGEwZjk3OTkzODAyNmQ2Y2M5OTFm NDhhNjExIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZV91bml0 dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZV91bml0dGVzdC5w eQpAQCAtMzYsNiArMzYsNyBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZmlsZXN5c3Rl bV9tb2NrIGltcG9ydCBNb2NrRmlsZVN5c3RlbQogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVt Lm91dHB1dGNhcHR1cmUgaW1wb3J0IE91dHB1dENhcHR1cmUKIGZyb20gd2Via2l0cHkuY29tbW9u LnN5c3RlbS5leGVjdXRpdmVfbW9jayBpbXBvcnQgTW9ja0V4ZWN1dGl2ZTIKIGZyb20gd2Via2l0 cHkuY29tbW9uLnN5c3RlbS5zeXN0ZW1ob3N0X21vY2sgaW1wb3J0IE1vY2tTeXN0ZW1Ib3N0Citm cm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0X21vY2sgaW1wb3J0IE1vY2tIb3N0CiAKIGZyb20gd2Vi a2l0cHkucG9ydCBpbXBvcnQgUG9ydAogZnJvbSB3ZWJraXRweS5wb3J0LnRlc3QgaW1wb3J0IGFk ZF91bml0X3Rlc3RzX3RvX21vY2tfZmlsZXN5c3RlbSwgVGVzdFBvcnQKQEAgLTQ2LDcgKzQ3LDcg QEAgZGVmIGNtcChhLCBiKToKIAogY2xhc3MgUG9ydFRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgog ICAgIGRlZiBtYWtlX3BvcnQoc2VsZiwgZXhlY3V0aXZlPU5vbmUsIHdpdGhfdGVzdHM9RmFsc2Us IHBvcnRfbmFtZT1Ob25lLCAqKmt3YXJncyk6Ci0gICAgICAgIGhvc3QgPSBNb2NrU3lzdGVtSG9z dCgpCisgICAgICAgIGhvc3QgPSBNb2NrSG9zdChjcmVhdGVfc3R1Yl9yZXBvc2l0b3J5X2ZpbGVz PVRydWUpCiAgICAgICAgIGlmIGV4ZWN1dGl2ZToKICAgICAgICAgICAgIGhvc3QuZXhlY3V0aXZl ID0gZXhlY3V0aXZlCiAgICAgICAgIGlmIHdpdGhfdGVzdHM6CkBAIC00MzUsNiArNDM2LDEwIEBA IGNsYXNzIFBvcnRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgIHBvcnQucmVm ZXJlbmNlX2ZpbGVzKCdmYXN0L3JlZi5odG1sJyksCiAgICAgICAgICkKIAorICAgIGRlZiB0ZXN0 X2NvbW1pdHNfZm9yX3VwbG9hZChzZWxmKToKKyAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0 KHBvcnRfbmFtZT0nZm9vJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChbeydyZXBvc2l0b3J5 X2lkJzogJ3dlYmtpdCcsICdpZCc6ICcyNzM4NDk5JywgJ2JyYW5jaCc6ICd0cnVuayd9XSwgcG9y dC5jb21taXRzX2Zvcl91cGxvYWQoKSkKKwogCiBjbGFzcyBOYXR1cmFsQ29tcGFyZVRlc3QodW5p dHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiBzZXRVcChzZWxmKToK