222443 2021-02-25 15:52:24 -0800 [resultsdbpy] Use webkitcorepy requests mocking 2021-02-26 13:03:59 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dewei_zhu slewis webkit-bug-importer oldest_to_newest 1733570 0 jbedard 2021-02-25 15:52:24 -0800 resultsdbpy should not duplicate requests mocking logic. This is also important because the logic defined in webkitcorepy can be stacked, while the mock structures used in resultsdbpy testing cannot be. 1733572 1 webkit-bug-importer 2021-02-25 15:52:52 -0800 <rdar://problem/74764567> 1733575 2 421579 jbedard 2021-02-25 15:56:25 -0800 Created attachment 421579 Patch 1733953 3 ews-feeder 2021-02-26 13:03:58 -0800 Committed r273584: <https://commits.webkit.org/r273584> All reviewed patches have been landed. Closing bug and clearing flags on attachment 421579. 421579 2021-02-25 15:56:25 -0800 2021-02-26 13:03:59 -0800 Patch bug-222443-20210225155624.patch text/plain 14243 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MzUxOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMxIEBACisyMDIxLTAyLTI1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcmVzdWx0c2RicHldIFVzZSB3ZWJraXRjb3JlcHkgcmVxdWVzdHMgbW9j a2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIy NDQzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDc2NDU2Nz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3Jlc3Vs dHNkYnB5L3Jlc3VsdHNkYnB5L19faW5pdF9fLnB5OiBCdW1wIHZlcnNpb24uCisgICAgICAgICog U2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvbW9kZWwvY2Fzc2Vyb2xl X3VuaXR0ZXN0LnB5OgorICAgICAgICAoQ2Fzc2Vyb2xlVGVzdC50ZXN0X3N5bmNocm9ub3VzKTog VXNlIHdlYmtpdGNvcmVweSdzIHJlcXVlc3RzIG1vY2tpbmcuCisgICAgICAgIChDYXNzZXJvbGVU ZXN0LnRlc3RfYXN5bmNocm9ub3VzKTogRGl0dG8uCisgICAgICAgIChDYXNzZXJvbGVUZXN0LnRl c3RfbGlzdF9saWtlKTogRGl0dG8uCisgICAgICAgIChNb2NrUmVxdWVzdCk6IERlbGV0ZWQuCisg ICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvbW9kZWwv Y2lfY29udGV4dF91bml0dGVzdC5weToKKyAgICAgICAgKFVSTEZhY3RvcnlUZXN0Lm1vY2spOiBV c2Ugd2Via2l0Y29yZXB5J3MgcmVxdWVzdHMgbW9ja2luZy4KKyAgICAgICAgKFVSTEZhY3RvcnlU ZXN0Lk1vY2tSZXF1ZXN0KTogRGVsZXRlZC4KKyAgICAgICAgKFVSTEZhY3RvcnlUZXN0LmdldCk6 IERlbGV0ZWQuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvcmVzdWx0 c2RicHkvdmlldy92aWV3X3JvdXRlc191bml0dGVzdC5weToKKyAgICAgICAgKFdlYlNpdGVUZXN0 Q2FzZS5kZWNvcmF0b3IpOiBSZWZlcmVuY2VkIHN0YXRpYyBmaWxlcyBoYXZlIGFscmVhZHkgYmVl biBtb3ZlZC4KKyAgICAgICAgKFdlYlNpdGVUZXN0Q2FzZS5kZWNvcmF0b3IuTW9ja1JlcXVlc3Qp OiBEZWxldGVkLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3Jlc3VsdHNkYnB5L3NldHVw LnB5OiBCdW1wIHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29y ZXB5L3NldHVwLnB5OiBEaXR0by4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRj b3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5OiBEaXR0by4KKyAgICAgICAgKiBTY3JpcHRz L2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L21vY2tzL3JlcXVlc3RzXy5weToK KyAgICAgICAgKFJlcXVlc3RzLl9faW5pdF9fKTogQWxsb3cgY2FsbGVyIHRvIHNwZWNpZnkgY2Vy dGFpbiByZXNwb25zZXMuCisgICAgICAgIChSZXF1ZXN0cy5yZXF1ZXN0KToKKwogMjAyMS0wMi0y NSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAg IE1ha2UgaW50ZXJuYWwgQ29udGVudEZpbHRlcmluZyB0ZXN0cyBub3QgdGltZSBvdXQgYWZ0ZXIg cjI3MjI5MwpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvc2V0dXAu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvc2V0 dXAucHkJKHJldmlzaW9uIDI3MzUwMykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3Jlc3Vs dHNkYnB5L3NldHVwLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zMCw3ICszMCw3IEBAIGRlZiByZWFk bWUoKToKIAogc2V0dXAoCiAgICAgbmFtZT0ncmVzdWx0c2RicHknLAotICAgIHZlcnNpb249JzEu MS4xJywKKyAgICB2ZXJzaW9uPScxLjEuMicsCiAgICAgZGVzY3JpcHRpb249J0xpYnJhcnkgZm9y IHZpc3VhbGl6aW5nLCBwcm9jZXNzaW5nIGFuZCBzdG9yaW5nIHRlc3QgcmVzdWx0cy4nLAogICAg IGxvbmdfZGVzY3JpcHRpb249cmVhZG1lKCksCiAgICAgY2xhc3NpZmllcnM9WwpJbmRleDogVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvX19pbml0X18ucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvcmVzdWx0 c2RicHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI3MzUwMykKKysrIFRvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkp CkBAIC00NCw2ICs0NCw2IEBAIGV4Y2VwdCBJbXBvcnRFcnJvcjoKICAgICAgICAgIlBsZWFzZSBp bnN0YWxsIHdlYmtpdGNvcmVweSB3aXRoIGBwaXAgaW5zdGFsbCB3ZWJraXRjb3JlcHkgLS1leHRy YS1pbmRleC11cmwgPHBhY2thZ2UgaW5kZXggVVJMPmAiCiAgICAgKQogCi12ZXJzaW9uID0gVmVy c2lvbigxLCAxLCAxKQordmVyc2lvbiA9IFZlcnNpb24oMSwgMSwgMikKIAogbmFtZSA9ICdyZXN1 bHRzZGJweScKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3Jlc3VsdHNkYnB5L3Jlc3Vs dHNkYnB5L21vZGVsL2Nhc3Nlcm9sZV91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL2xpYnJhcmllcy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS9tb2RlbC9jYXNzZXJvbGVf dW5pdHRlc3QucHkJKHJldmlzaW9uIDI3MzUwMykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L21vZGVsL2Nhc3Nlcm9sZV91bml0dGVzdC5weQkod29y a2luZyBjb3B5KQpAQCAtMSw0ICsxLDQgQEAKLSMgQ29weXJpZ2h0IChDKSAyMDE5IEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDE5LTIwMjEgQXBwbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBA IC0yMCw1MSArMjAsNDcgQEAKICMgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RI RVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKICMgT0YgVEhJUyBTT0ZU V0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4K IAotaW1wb3J0IG1vY2sKIGltcG9ydCB0aW1lCiBpbXBvcnQgdW5pdHRlc3QKIAogZnJvbSByZXN1 bHRzZGJweS5tb2RlbC5jYXNzZXJvbGUgaW1wb3J0IENhc3Nlcm9sZU5vZGVzCi0KLQotY2xhc3Mg TW9ja1JlcXVlc3Qob2JqZWN0KToKLQotICAgIGRlZiBfX2luaXRfXyhzZWxmLCB0ZXh0PScnLCBz dGF0dXNfY29kZT0yMDApOgotICAgICAgICB0aW1lLnNsZWVwKC4xKSAgIyBUaGlzIHNwbGl0IHNl Y29uZCBhY3RzIGxpa2UgYW4gYWN0dWFsIHJlcXVlc3QKLSAgICAgICAgc2VsZi50ZXh0ID0gdGV4 dAotICAgICAgICBzZWxmLnN0YXR1c19jb2RlID0gc3RhdHVzX2NvZGUKK2Zyb20gd2Via2l0Y29y ZXB5IGltcG9ydCBtb2NrcwogCiAKIGNsYXNzIENhc3Nlcm9sZVRlc3QodW5pdHRlc3QuVGVzdENh c2UpOgogICAgIGRlZiB0ZXN0X3N5bmNocm9ub3VzKHNlbGYpOgotICAgICAgICB3aXRoIG1vY2su cGF0Y2goJ3JlcXVlc3RzLmdldCcsIG5ldz1sYW1iZGEgKmFyZ3MsICoqa3dhcmdzOiBNb2NrUmVx dWVzdCgnc3RhcnQnKSk6Ci0gICAgICAgICAgICBub2RlcyA9IENhc3Nlcm9sZU5vZGVzKCdzb21l LXVybCcsIGludGVydmFsX3NlY29uZHM9MTAsIGFzeW5jaHJvbm91cz1GYWxzZSkKKyAgICAgICAg d2l0aCBtb2Nrcy5SZXF1ZXN0cygnY2Fzc2Vyb2xlLndlYmtpdC5vcmcnLCAqKnsKKyAgICAgICAg ICAgICdhcGkvY2x1c3Rlci1lbmRwb2ludHMnOiBtb2Nrcy5SZXNwb25zZSh0ZXh0PSdzdGFydCcp CisgICAgICAgIH0pLCBtb2Nrcy5UaW1lOgorICAgICAgICAgICAgbm9kZXMgPSBDYXNzZXJvbGVO b2RlcygnaHR0cHM6Ly9jYXNzZXJvbGUud2Via2l0Lm9yZy9hcGkvY2x1c3Rlci1lbmRwb2ludHMn LCBpbnRlcnZhbF9zZWNvbmRzPTEwLCBhc3luY2hyb25vdXM9RmFsc2UpCiAgICAgICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKFsnc3RhcnQnXSwgbm9kZXMubm9kZXMpCiAKLSAgICAgICAgICAgIHdp dGggbW9jay5wYXRjaCgncmVxdWVzdHMuZ2V0JywgbmV3PWxhbWJkYSAqYXJncywgKiprd2FyZ3M6 IE1vY2tSZXF1ZXN0KCd1cmwxLHVybDInKSk6CisgICAgICAgICAgICB3aXRoIG1vY2tzLlJlcXVl c3RzKCdjYXNzZXJvbGUud2Via2l0Lm9yZycsICoqeworICAgICAgICAgICAgICAgICdhcGkvY2x1 c3Rlci1lbmRwb2ludHMnOiBtb2Nrcy5SZXNwb25zZSh0ZXh0PSd1cmwxLHVybDInKQorICAgICAg ICAgICAgfSk6CiAgICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChbJ3N0YXJ0J10sIG5v ZGVzLm5vZGVzKQotICAgICAgICAgICAgICAgIGN1cnJlbnRfdGltZSA9IHRpbWUudGltZSgpCi0K LSAgICAgICAgICAgICAgICB3aXRoIG1vY2sucGF0Y2goJ3RpbWUudGltZScsIG5ldz1sYW1iZGE6 IGN1cnJlbnRfdGltZSArIDE1KToKLSAgICAgICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChbJ3VybDEnLCAndXJsMiddLCBub2Rlcy5ub2RlcykKKyAgICAgICAgICAgICAgICB0aW1lLnNs ZWVwKDE1KQorICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoWyd1cmwxJywgJ3VybDIn XSwgbm9kZXMubm9kZXMpCiAKICAgICBkZWYgdGVzdF9hc3luY2hyb25vdXMoc2VsZik6Ci0gICAg ICAgIHdpdGggbW9jay5wYXRjaCgncmVxdWVzdHMuZ2V0JywgbmV3PWxhbWJkYSAqYXJncywgKipr d2FyZ3M6IE1vY2tSZXF1ZXN0KCdzdGFydCcpKToKLSAgICAgICAgICAgIG5vZGVzID0gQ2Fzc2Vy b2xlTm9kZXMoJ3NvbWUtdXJsJywgaW50ZXJ2YWxfc2Vjb25kcz0xMCwgYXN5bmNocm9ub3VzPVRy dWUpCisgICAgICAgIHdpdGggbW9ja3MuUmVxdWVzdHMoJ2Nhc3Nlcm9sZS53ZWJraXQub3JnJywg Kip7CisgICAgICAgICAgICAnYXBpL2NsdXN0ZXItZW5kcG9pbnRzJzogbW9ja3MuUmVzcG9uc2Uo dGV4dD0nc3RhcnQnKQorICAgICAgICB9KSwgbW9ja3MuVGltZToKKyAgICAgICAgICAgIG5vZGVz ID0gQ2Fzc2Vyb2xlTm9kZXMoJ2h0dHBzOi8vY2Fzc2Vyb2xlLndlYmtpdC5vcmcvYXBpL2NsdXN0 ZXItZW5kcG9pbnRzJywgaW50ZXJ2YWxfc2Vjb25kcz0xMCwgYXN5bmNocm9ub3VzPVRydWUpCiAg ICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFsnc3RhcnQnXSwgbm9kZXMubm9kZXMpCiAKLSAg ICAgICAgICAgIHdpdGggbW9jay5wYXRjaCgncmVxdWVzdHMuZ2V0JywgbmV3PWxhbWJkYSAqYXJn cywgKiprd2FyZ3M6IE1vY2tSZXF1ZXN0KCd1cmwxLHVybDInKSk6CisgICAgICAgICAgICB3aXRo IG1vY2tzLlJlcXVlc3RzKCdjYXNzZXJvbGUud2Via2l0Lm9yZycsICoqeworICAgICAgICAgICAg ICAgICdhcGkvY2x1c3Rlci1lbmRwb2ludHMnOiBtb2Nrcy5SZXNwb25zZSh0ZXh0PSd1cmwxLHVy bDInKQorICAgICAgICAgICAgfSk6CiAgICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChb J3N0YXJ0J10sIG5vZGVzLm5vZGVzKQotICAgICAgICAgICAgICAgIGN1cnJlbnRfdGltZSA9IHRp bWUudGltZSgpCi0KLSAgICAgICAgICAgICAgICB3aXRoIG1vY2sucGF0Y2goJ3RpbWUudGltZScs IG5ldz1sYW1iZGE6IGN1cnJlbnRfdGltZSArIDE1KToKLSAgICAgICAgICAgICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChbJ3N0YXJ0J10sIG5vZGVzLm5vZGVzKQotICAgICAgICAgICAgICAgICAg ICB0aW1lLnNsZWVwKC4xNSkgICMgV2FpdCBmb3IgdGhlIGFzeW5jaHJvbm91cyB0aHJlYWQgdG8g ZmluaXNoCi0gICAgICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoWyd1cmwxJywgJ3Vy bDInXSwgbm9kZXMubm9kZXMpCisgICAgICAgICAgICAgICAgdGltZS5zbGVlcCgxNSkKKyAgICAg ICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFsndXJsMScsICd1cmwyJ10sIG5vZGVzLm5vZGVz KQogCiAgICAgZGVmIHRlc3RfbGlzdF9saWtlKHNlbGYpOgotICAgICAgICB3aXRoIG1vY2sucGF0 Y2goJ3JlcXVlc3RzLmdldCcsIG5ldz1sYW1iZGEgKmFyZ3MsICoqa3dhcmdzOiBNb2NrUmVxdWVz dCgndXJsMSx1cmwyLHVybDMnKSk6Ci0gICAgICAgICAgICBub2RlcyA9IENhc3Nlcm9sZU5vZGVz KCdzb21lLXVybCcpCisgICAgICAgIHdpdGggbW9ja3MuUmVxdWVzdHMoJ2Nhc3Nlcm9sZS53ZWJr aXQub3JnJywgKip7CisgICAgICAgICAgICAnYXBpL2NsdXN0ZXItZW5kcG9pbnRzJzogbW9ja3Mu UmVzcG9uc2UodGV4dD0ndXJsMSx1cmwyLHVybDMnKQorICAgICAgICB9KToKKyAgICAgICAgICAg IG5vZGVzID0gQ2Fzc2Vyb2xlTm9kZXMoJ2h0dHBzOi8vY2Fzc2Vyb2xlLndlYmtpdC5vcmcvYXBp L2NsdXN0ZXItZW5kcG9pbnRzJykKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoWyd1cmwx JywgJ3VybDInLCAndXJsMyddLCBbbm9kZSBmb3Igbm9kZSBpbiBub2Rlc10pCiAgICAgICAgICAg ICBzZWxmLmFzc2VydFRydWUobm9kZXMpCiAgICAgICAgICAgICBzZWxmLmFzc2VydFRydWUoJ3Vy bDEnIGluIG5vZGVzKQpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkv cmVzdWx0c2RicHkvbW9kZWwvY2lfY29udGV4dF91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL2xpYnJhcmllcy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS9tb2RlbC9jaV9j b250ZXh0X3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNzM1MDMpCisrKyBUb29scy9TY3JpcHRzL2xp YnJhcmllcy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS9tb2RlbC9jaV9jb250ZXh0X3VuaXR0ZXN0 LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xLDQgKzEsNCBAQAotIyBDb3B5cmlnaHQgKEMpIDIwMTkg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMTktMjAy MS0yMDIxIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMKICMgUmVkaXN0cmlidXRp b24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAj IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucwpAQCAtMzYsMTcgKzM2LDEwIEBAIGZyb20gcmVzdWx0c2RicHkubW9kZWwubW9j a19tb2RlbF9mYWN0b3IKIGZyb20gcmVzdWx0c2RicHkubW9kZWwubW9ja19yZXBvc2l0b3J5IGlt cG9ydCBNb2NrU1ZOUmVwb3NpdG9yeQogZnJvbSByZXN1bHRzZGJweS5tb2RlbC53YWl0X2Zvcl9k b2NrZXJfdGVzdF9jYXNlIGltcG9ydCBXYWl0Rm9yRG9ja2VyVGVzdENhc2UKIAorZnJvbSB3ZWJr aXRjb3JlcHkgaW1wb3J0IG1vY2tzCiAKLWNsYXNzIFVSTEZhY3RvcnlUZXN0KFdhaXRGb3JEb2Nr ZXJUZXN0Q2FzZSk6Ci0KLSAgICBjbGFzcyBNb2NrUmVxdWVzdChvYmplY3QpOgotCi0gICAgICAg IGRlZiBfX2luaXRfXyhzZWxmLCB0ZXh0PScnLCBzdGF0dXNfY29kZT0yMDApOgotICAgICAgICAg ICAgc2VsZi50ZXh0ID0gdGV4dAotICAgICAgICAgICAgc2VsZi5zdGF0dXNfY29kZSA9IHN0YXR1 c19jb2RlCiAKLSAgICAgICAgZGVmIGpzb24oc2VsZik6Ci0gICAgICAgICAgICByZXR1cm4ganNv bi5sb2FkcyhzZWxmLnRleHQpCitjbGFzcyBVUkxGYWN0b3J5VGVzdChXYWl0Rm9yRG9ja2VyVGVz dENhc2UpOgogCiAgICAgQlVJTERfTUFTVEVSID0gJ2J1aWxkLndlYmtpdC5vcmcnCiAKQEAgLTIx NCwxNyArMjA3LDE0IEBAIGNsYXNzIFVSTEZhY3RvcnlUZXN0KFdhaXRGb3JEb2NrZXJUZXN0Q2EK ICAgICApCiAKICAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgZ2V0KGNscywgdXJsLCAqYXJncywg Kiprd2FyZ3MpOgotICAgICAgICBpZiB1cmwgPT0gZidodHRwczovL3tjbHMuQlVJTERfTUFTVEVS fS9hcGkvdjIvYnVpbGRlcnMnOgotICAgICAgICAgICAgcmV0dXJuIGNscy5Nb2NrUmVxdWVzdCh0 ZXh0PWpzb24uZHVtcHMoY2xzLkJVSUxERVJTKSkKLSAgICAgICAgaWYgdXJsID09IGYnaHR0cHM6 Ly97Y2xzLkJVSUxEX01BU1RFUn0vYXBpL3YyL3dvcmtlcnMnOgotICAgICAgICAgICAgcmV0dXJu IGNscy5Nb2NrUmVxdWVzdCh0ZXh0PWpzb24uZHVtcHMoY2xzLldPUktFUlMpKQotICAgICAgICBy ZXR1cm4gY2xzLk1vY2tSZXF1ZXN0KHN0YXR1c19jb2RlPTUwMCkKLQotICAgIEBjbGFzc21ldGhv ZAogICAgIEBjb250ZXh0bGliLmNvbnRleHRtYW5hZ2VyCiAgICAgZGVmIG1vY2soY2xzKToKLSAg ICAgICAgd2l0aCBtb2NrLnBhdGNoKCdyZXF1ZXN0cy5nZXQnLCBuZXc9Y2xzLmdldCk6CisgICAg ICAgIHdpdGggbW9ja3MuUmVxdWVzdHMoCisgICAgICAgICAgICBjbHMuQlVJTERfTUFTVEVSLCAq KnsKKyAgICAgICAgICAgICAgICAnYXBpL3YyL2J1aWxkZXJzJzogbW9ja3MuUmVzcG9uc2UuZnJv bUpzb24oY2xzLkJVSUxERVJTKSwKKyAgICAgICAgICAgICAgICAnYXBpL3YyL3dvcmtlcnMnOiBt b2Nrcy5SZXNwb25zZS5mcm9tSnNvbihjbHMuV09SS0VSUyksCisgICAgICAgICAgICB9LAorICAg ICAgICApOgogICAgICAgICAgICAgeWllbGQKIAogICAgIEBXYWl0Rm9yRG9ja2VyVGVzdENhc2Uu bW9ja19pZl9ub19kb2NrZXIobW9ja19yZWRpcz1GYWtlU3RyaWN0UmVkaXMpCkluZGV4OiBUb29s cy9TY3JpcHRzL2xpYnJhcmllcy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3ZpZXdfcm91 dGVzX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3Jl c3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvdmlld19yb3V0ZXNfdW5pdHRlc3QucHkJKHJldmlz aW9uIDI3MzUwMykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3Jlc3VsdHNkYnB5L3Jlc3Vs dHNkYnB5L3ZpZXcvdmlld19yb3V0ZXNfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTEs NCArMSw0IEBACi0jIENvcHlyaWdodCAoQykgMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisjIENvcHlyaWdodCAoQykgMjAxOS0yMDIxIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBw cm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzYsNiArMzYsOCBAQCBm cm9tIHJlc3VsdHNkYnB5Lm1vZGVsLm1vY2tfcmVwb3NpdG9yeSBpCiBmcm9tIHJlc3VsdHNkYnB5 Lm1vZGVsLndhaXRfZm9yX2RvY2tlcl90ZXN0X2Nhc2UgaW1wb3J0IFdhaXRGb3JEb2NrZXJUZXN0 Q2FzZQogZnJvbSByZXN1bHRzZGJweS52aWV3LnZpZXdfcm91dGVzIGltcG9ydCBWaWV3Um91dGVz CiAKK2Zyb20gd2Via2l0Y29yZXB5IGltcG9ydCBtb2NrcworCiAKIGNsYXNzIFdlYlNpdGVUZXN0 Q2FzZShGbGFza1Rlc3RDYXNlLCBXYWl0Rm9yRG9ja2VyVGVzdENhc2UpOgogICAgIEtFWVNQQUNF ID0gJ3dlYl9zaXRlX3Rlc3RjYXNlX2tleXNwYWNlJwpAQCAtNzEsMjkgKzczLDcgQEAgY2xhc3Mg V2ViU2l0ZVRlc3RDYXNlKEZsYXNrVGVzdENhc2UsIFdhaQogCiAgICAgQGNsYXNzbWV0aG9kCiAg ICAgZGVmIGRlY29yYXRvcihjbHMpOgotICAgICAgICBjbGFzcyBNb2NrUmVxdWVzdChvYmplY3Qp OgotICAgICAgICAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHRleHQ9JycsIHN0YXR1c19jb2RlPTIw MCwgaGVhZGVycz17J2NvbnRlbnQtdHlwZSc6ICd0ZXh0L2h0bWwnfSk6Ci0gICAgICAgICAgICAg ICAgc2VsZi50ZXh0ID0gdGV4dAotICAgICAgICAgICAgICAgIHNlbGYuc3RhdHVzX2NvZGUgPSBz dGF0dXNfY29kZQotICAgICAgICAgICAgICAgIHNlbGYuaGVhZGVycyA9IGhlYWRlcnMKLQotICAg ICAgICBvcmlnaW5hbF9nZXQgPSByZXF1ZXN0cy5nZXQKLQotICAgICAgICBkZWYgbW9ja19nZXQo dXJsLCBvcmlnaW5hbF9nZXQ9b3JpZ2luYWxfZ2V0LCAqKmt3YXJncyk6Ci0gICAgICAgICAgICAj IEZJWE1FOiBMb25nIHRlcm0sIHRoZSByZXN1bHRzIGRhdGFiYXNlIG1pZ2h0IGFjdHVhbGx5IGJl IHRoZSBiZXR0ZXIgcGxhY2UgZm9yIFJlZi5qcyBhbmQgd2Via2l0LmNzcyB0byBsaXZlCi0gICAg ICAgICAgICBiYXNlX3BhdGggPSBvcy5wYXRoLmpvaW4ob3MucGF0aC5hYnNwYXRoKG9zLnBhdGgu ZGlybmFtZShvcy5wYXRoLmRpcm5hbWUob3MucGF0aC5kaXJuYW1lKG9zLnBhdGguZGlybmFtZShv cy5wYXRoLmRpcm5hbWUob3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKSkpKSkpKSwgJ0ludGVybmFs JywgJ1Rvb2xzJywgJ0J1aWxkQXV0b21hdGlvbicsICdidWlsZC1zYWZhcmknLCAncHVibGljX2h0 bWwnLCAnZGFzaGJvYXJkJykKLSAgICAgICAgICAgIGlmIHVybCA9PSAnaHR0cHM6Ly9idWlsZC53 ZWJraXQub3JnL2Rhc2hib2FyZC9kZXZpY2VzL1NjcmlwdHMvUmVmLmpzJzoKLSAgICAgICAgICAg ICAgICB3aXRoIG9wZW4ob3MucGF0aC5qb2luKGJhc2VfcGF0aCwgJ2RldmljZXMnLCAnU2NyaXB0 cycsICdSZWYuanMnKSwgJ3InKSBhcyBmOgotICAgICAgICAgICAgICAgICAgICByZXR1cm4gTW9j a1JlcXVlc3QoZi5yZWFkKCksIGhlYWRlcnM9eydjb250ZW50LXR5cGUnOiAndGV4dC9qYXZhc2Ny aXB0J30pCi0gICAgICAgICAgICBlbGlmIHVybCA9PSAnaHR0cHM6Ly9idWlsZC53ZWJraXQub3Jn L2Rhc2hib2FyZC9TdHlsZXMvd2Via2l0LmNzcyc6Ci0gICAgICAgICAgICAgICAgd2l0aCBvcGVu KG9zLnBhdGguam9pbihiYXNlX3BhdGgsICdTdHlsZXMnLCAnd2Via2l0LmNzcycpLCAncicpIGFz IGY6Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiBNb2NrUmVxdWVzdChmLnJlYWQoKSwgaGVh ZGVycz17J2NvbnRlbnQtdHlwZSc6ICd0ZXh0L2Nzcyd9KQotICAgICAgICAgICAgcmV0dXJuIG9y aWdpbmFsX2dldCh1cmwsICoqa3dhcmdzKQotCi0gICAgICAgIHJldHVybiBGbGFza1Rlc3RDYXNl LmNvbWJpbmUoCi0gICAgICAgICAgICBtb2NrLnBhdGNoKCdyZXF1ZXN0cy5nZXQnLCBuZXc9bW9j a19nZXQpLAotICAgICAgICAgICAgRmxhc2tUZXN0Q2FzZS5ydW5fd2l0aF9zZWxlbml1bSgpLAot ICAgICAgICApCisgICAgICAgIHJldHVybiBGbGFza1Rlc3RDYXNlLnJ1bl93aXRoX3NlbGVuaXVt KCkKIAogCiBjbGFzcyBXZWJTaXRlVW5pdHRlc3QoV2ViU2l0ZVRlc3RDYXNlKToKSW5kZXg6IFRv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1cC5weQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvc2V0dXAucHkJKHJldmlzaW9u IDI3MzUwMykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1cC5w eQkod29ya2luZyBjb3B5KQpAQCAtMzAsNyArMzAsNyBAQCBkZWYgcmVhZG1lKCk6CiAKIHNldHVw KAogICAgIG5hbWU9J3dlYmtpdGNvcmVweScsCi0gICAgdmVyc2lvbj0nMC41LjInLAorICAgIHZl cnNpb249JzAuNS4zJywKICAgICBkZXNjcmlwdGlvbj0nTGlicmFyeSBjb250YWluaW5nIHZhcmlv dXMgUHl0aG9uIHN1cHBvcnQgY2xhc3NlcyBhbmQgZnVuY3Rpb25zLicsCiAgICAgbG9uZ19kZXNj cmlwdGlvbj1yZWFkbWUoKSwKICAgICBjbGFzc2lmaWVycz1bCkluZGV4OiBUb29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkv X19pbml0X18ucHkJKHJldmlzaW9uIDI3MzUwMykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAg LTM2LDcgKzM2LDcgQEAgZnJvbSB3ZWJraXRjb3JlcHkuc3VicHJvY2Vzc191dGlscyBpbXBvcgog ZnJvbSB3ZWJraXRjb3JlcHkub3V0cHV0X2NhcHR1cmUgaW1wb3J0IExvZ2dlckNhcHR1cmUsIE91 dHB1dENhcHR1cmUsIE91dHB1dER1cGxpY2F0ZQogZnJvbSB3ZWJraXRjb3JlcHkudGFza19wb29s IGltcG9ydCBUYXNrUG9vbAogCi12ZXJzaW9uID0gVmVyc2lvbigwLCA1LCAyKQordmVyc2lvbiA9 IFZlcnNpb24oMCwgNSwgMykKIAogZnJvbSB3ZWJraXRjb3JlcHkuYXV0b2luc3RhbGwgaW1wb3J0 IFBhY2thZ2UsIEF1dG9JbnN0YWxsCiBpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDApOgpJbmRl eDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9tb2Nr cy9yZXF1ZXN0c18ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0Y29yZXB5L3dlYmtpdGNvcmVweS9tb2Nrcy9yZXF1ZXN0c18ucHkJKHJldmlzaW9uIDI3MzUw MykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkv bW9ja3MvcmVxdWVzdHNfLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xLDQgKzEsNCBAQAotIyBDb3B5 cmlnaHQgKEMpIDIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmln aHQgKEMpIDIwMjAtMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAogIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTgzLDEyICs4MywxOSBAQCBjbGFzcyBSZXNwb25zZShv YmplY3QpOgogY2xhc3MgUmVxdWVzdHMoQ29udGV4dFN0YWNrKToKICAgICB0b3AgPSBOb25lCiAK LSAgICBkZWYgX19pbml0X18oc2VsZiwgKmhvc3RzKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwg Kmhvc3RzLCAqKmt3YXJncyk6CiAgICAgICAgIHN1cGVyKFJlcXVlc3RzLCBzZWxmKS5fX2luaXRf XyhjbHM9UmVxdWVzdHMpCiAgICAgICAgIHNlbGYuaG9zdHMgPSBob3N0cwogICAgICAgICBzZWxm Ll90ZW1wX3BhdGNoZXMgPSBOb25lCisgICAgICAgIHNlbGYuX3Jlc3BvbnNlcyA9IGt3YXJncwog CiAgICAgZGVmIHJlcXVlc3Qoc2VsZiwgbWV0aG9kLCB1cmwsICoqa3dhcmdzKToKKyAgICAgICAg c3RyaXBwZWRfdXJsID0gdXJsLnNwbGl0KCc6Ly8nKVstMV0KKyAgICAgICAgY2FuZGlkYXRlID0g c2VsZi5fcmVzcG9uc2VzLmdldCgnLycuam9pbihzdHJpcHBlZF91cmwuc3BsaXQoJy8nKVsxOl0p KQorICAgICAgICBpZiBpc2luc3RhbmNlKGNhbmRpZGF0ZSwgUmVzcG9uc2UpOgorICAgICAgICAg ICAgcmV0dXJuIGNhbmRpZGF0ZQorICAgICAgICBpZiBjYW5kaWRhdGU6CisgICAgICAgICAgICBy ZXR1cm4gY2FuZGlkYXRlKG1ldGhvZCwgdXJsLCAqKmt3YXJncykKICAgICAgICAgcmV0dXJuIFJl c3BvbnNlLmNyZWF0ZTQwNCh1cmwpCiAKICAgICBkZWYgX19lbnRlcl9fKHNlbGYpOgo=