221861 2021-02-12 16:52:08 -0800 [results.webkit.org] Distinguish hash and revision 2021-02-15 11:58:41 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=221860 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain webkit-bug-importer oldest_to_newest 1728860 0 jbedard 2021-02-12 16:52:08 -0800 Right now, both hash and revision are treated as an id. We should distinguish the two in the json the results database returns. 1728861 1 webkit-bug-importer 2021-02-12 16:52:40 -0800 <rdar://problem/74298457> 1728865 2 420196 jbedard 2021-02-12 16:54:08 -0800 Created attachment 420196 Patch 1729184 3 420196 aakash_jain 2021-02-15 09:18:04 -0800 Comment on attachment 420196 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420196&action=review > Tools/Scripts/libraries/resultsdbpy/resultsdbpy/controller/commit.py:-48 > - def __init__(self, repository_id, branch, id, timestamp=None, order=None, committer=None, message=None): can we keep it one line for readability. > Tools/Scripts/libraries/resultsdbpy/resultsdbpy/controller/commit.py:55 > + ): We should probably have a check at the beginning of this method which limits passing only one of (id, revision, identifier). I believe passing multiple ones isn't expected. > Tools/Scripts/libraries/resultsdbpy/resultsdbpy/controller/commit.py:76 > + self.revision = self.revision if self.revision else self.id Better to keep it explicit multi-line if else. When written that way, I don't see a reason to do: self.revision = self.revision > Tools/Scripts/libraries/resultsdbpy/resultsdbpy/controller/commit.py:78 > + self.hash = self.hash if self.hash else self.id Ditto. > Tools/Scripts/libraries/resultsdbpy/resultsdbpy/controller/commit.py:84 > + raise ValueError(f"'{self.revision}' is an revision") This error message doesn't look like an error, more like an information. Can be improved to look like an error and actually indicate what's the error here. 1729198 4 420196 jbedard 2021-02-15 09:49:57 -0800 Comment on attachment 420196 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420196&action=review >> Tools/Scripts/libraries/resultsdbpy/resultsdbpy/controller/commit.py:55 >> + ): > > We should probably have a check at the beginning of this method which limits passing only one of (id, revision, identifier). I believe passing multiple ones isn't expected. We will be passing multiple ones, as an example, https://commits.webkit.org/234094@main would be: id=234094@main hash= ee0111014bf107a0958f023114778b75eddc8a4d revision=272858 1729201 5 420324 jbedard 2021-02-15 10:00:08 -0800 Created attachment 420324 Patch 1729209 6 420324 aakash_jain 2021-02-15 10:08:09 -0800 Comment on attachment 420324 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420324&action=review > Tools/Scripts/libraries/resultsdbpy/resultsdbpy/controller/commit.py:70 > + if re.match(r'[0-9]+$', self.id): Might be good to make this re a variable, like RE_SVN_REVISION > Tools/Scripts/libraries/resultsdbpy/resultsdbpy/controller/commit.py:73 > + elif re.match(r'[a-fA-F0-9]+$', self.id): Might be good to make this re a variable, like RE_GIT_HASH 1729233 7 420333 jbedard 2021-02-15 10:45:46 -0800 Created attachment 420333 Patch 1729281 8 ews-feeder 2021-02-15 11:58:40 -0800 Committed r272872: <https://commits.webkit.org/r272872> All reviewed patches have been landed. Closing bug and clearing flags on attachment 420333. 420196 2021-02-12 16:54:08 -0800 2021-02-15 10:00:06 -0800 Patch bug-221861-20210212165408.patch text/plain 3025 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyODE3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjU2M2M3YjUzY2FiOGQ3MTBlNzcwMWFiMDE5ZGExMzQy ZDUyMTFjMS4uNDJmNGIxYTQ2ZDM2NDNjYWNjYWJiNWE0MjMwZjA3MDIzYTU2ZjA4NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIxLTAyLTEyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbcmVzdWx0cy53ZWJraXQub3JnXSBEaXN0aW5ndWlzaCBoYXNoIGFuZCByZXZpc2lv bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxODYx CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDI5ODQ1Nz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3Jlc3VsdHNk YnB5L3Jlc3VsdHNkYnB5L2NvbnRyb2xsZXIvY29tbWl0LnB5OgorICAgICAgICAoQ29tbWl0LmZy b21fanNvbik6IFBhc3MgaGFzaCBhbmQgcmV2aXNpb24gdmlhIGpzb24uCisgICAgICAgIChDb21t aXQuX19pbml0X18pOiBDb252ZXJ0IGlkIHRvIGhhc2ggb3IgcmV2aXNpb24uCisKIDIwMjEtMDIt MTIgIFJ5YW4gSGFkZGFkICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVT U0lPTiAocjI2ODQyMSk6IFRlc3RXZWJLaXRBUEkuV2ViS2l0LlByZWZlcmVuY2VDaGFuZ2VzKiB0 ZXN0cyBhcmUgZmxha3kgZmFpbHVyZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L2NvbnRyb2xsZXIvY29tbWl0LnB5IGIvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvY29udHJvbGxlci9jb21t aXQucHkKaW5kZXggOWViZDdlMGUyYzE3YWMwNjQ3MmNjODdiYjY5ODhiOGMzZWM4MTM5Mi4uNDEz M2VjNzRlNGEwMjU4MTcxMTFhMzAzYjQ1MGU3ZDUzOTQ2NWZhYSAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvY29udHJvbGxlci9jb21t aXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvcmVzdWx0c2Ri cHkvY29udHJvbGxlci9jb21taXQucHkKQEAgLTM5LDEzICszOSwyMCBAQCBjbGFzcyBDb21taXQo b2JqZWN0KToKICAgICAgICAgICAgIHJlcG9zaXRvcnlfaWQ9ZGF0YS5nZXQoJ3JlcG9zaXRvcnlf aWQnKSwKICAgICAgICAgICAgIGJyYW5jaD1kYXRhLmdldCgnYnJhbmNoJyksCiAgICAgICAgICAg ICBpZD1kYXRhLmdldCgnaWQnKSwKKyAgICAgICAgICAgIHJldmlzaW9uPWRhdGEuZ2V0KCdyZXZp c2lvbicpLAorICAgICAgICAgICAgaGFzaD1kYXRhLmdldCgnaGFzaCcpLAogICAgICAgICAgICAg dGltZXN0YW1wPWRhdGEuZ2V0KCd0aW1lc3RhbXAnKSwKICAgICAgICAgICAgIG9yZGVyPWRhdGEu Z2V0KCdvcmRlcicpLAogICAgICAgICAgICAgY29tbWl0dGVyPWRhdGEuZ2V0KCdjb21taXR0ZXIn KSwKICAgICAgICAgICAgIG1lc3NhZ2U9ZGF0YS5nZXQoJ21lc3NhZ2UnKSwKICAgICAgICAgKQog Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHJlcG9zaXRvcnlfaWQsIGJyYW5jaCwgaWQsIHRpbWVz dGFtcD1Ob25lLCBvcmRlcj1Ob25lLCBjb21taXR0ZXI9Tm9uZSwgbWVzc2FnZT1Ob25lKToKKyAg ICBkZWYgX19pbml0X18oCisgICAgICAgIHNlbGYsIHJlcG9zaXRvcnlfaWQsIGJyYW5jaCwKKyAg ICAgICAgaWQsCisgICAgICAgIHRpbWVzdGFtcD1Ob25lLCBvcmRlcj1Ob25lLCBjb21taXR0ZXI9 Tm9uZSwgbWVzc2FnZT1Ob25lLAorICAgICAgICByZXZpc2lvbj1Ob25lLCBoYXNoPU5vbmUsCisg ICAgKToKICAgICAgICAgZm9yIGFyZ3VtZW50IGluIFsoJ3JlcG9zaXRvcnlfaWQnLCByZXBvc2l0 b3J5X2lkKSwgKCdicmFuY2gnLCBicmFuY2gpLCAoJ2lkJywgaWQpLCAoJ3RpbWVzdGFtcCcsIHRp bWVzdGFtcCldOgogICAgICAgICAgICAgaWYgYXJndW1lbnRbMV0gaXMgTm9uZToKICAgICAgICAg ICAgICAgICByYWlzZSBWYWx1ZUVycm9yKGYne2FyZ3VtZW50WzBdfSBpcyBub3QgZGVmaW5lZCBm b3IgY29tbWl0JykKQEAgLTYzLDYgKzcwLDIxIEBAIGNsYXNzIENvbW1pdChvYmplY3QpOgogICAg ICAgICBpZiBub3QgcmUubWF0Y2gocideW2EtZkEtRjAtOT9dKyQnLCBzZWxmLmlkKSBvciBsZW4o c2VsZi5pZCkgPiA0MDoKICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoZiIne3NlbGYuaWR9 JyBpcyBhbiBpbnZhbGlkIGNvbW1pdCBpZCIpCiAKKyAgICAgICAgc2VsZi5yZXZpc2lvbiA9IHJl dmlzaW9uCisgICAgICAgIHNlbGYuaGFzaCA9IGhhc2gKKyAgICAgICAgaWYgcmUubWF0Y2gocidb MC05XSskJywgc2VsZi5pZCk6CisgICAgICAgICAgICBzZWxmLnJldmlzaW9uID0gc2VsZi5yZXZp c2lvbiBpZiBzZWxmLnJldmlzaW9uIGVsc2Ugc2VsZi5pZAorICAgICAgICBlbGlmIHJlLm1hdGNo KHInW2EtZkEtRjAtOV0rJCcsIHNlbGYuaWQpOgorICAgICAgICAgICAgc2VsZi5oYXNoID0gc2Vs Zi5oYXNoIGlmIHNlbGYuaGFzaCBlbHNlIHNlbGYuaWQKKworICAgICAgICBpZiBzZWxmLnJldmlz aW9uOgorICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgIHNlbGYucmV2aXNpb24gPSBp bnQoc2VsZi5yZXZpc2lvbikKKyAgICAgICAgICAgIGV4Y2VwdCBWYWx1ZUVycm9yOgorICAgICAg ICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoZiIne3NlbGYucmV2aXNpb259JyBpcyBhbiByZXZp c2lvbiIpCisgICAgICAgIGlmIHNlbGYuaGFzaDoKKyAgICAgICAgICAgIHNlbGYuaGFzaCA9IHNl bGYuaGFzaC5sb3dlcigpCisKICAgICAgICAgaWYgaXNpbnN0YW5jZSh0aW1lc3RhbXAsIGRhdGV0 aW1lKToKICAgICAgICAgICAgIHNlbGYudGltZXN0YW1wID0gdGltZXN0YW1wCiAgICAgICAgIGVs c2U6Cg== 420324 2021-02-15 10:00:08 -0800 2021-02-15 10:45:44 -0800 Patch bug-221861-20210215100007.patch text/plain 2824 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3Mjg1OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDIxLTAyLTE1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcmVzdWx0cy53ZWJraXQub3JnXSBEaXN0aW5ndWlzaCBoYXNoIGFuZCBy ZXZpc2lvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjIxODYxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDI5ODQ1Nz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3Jl c3VsdHNkYnB5L3Jlc3VsdHNkYnB5L2NvbnRyb2xsZXIvY29tbWl0LnB5OgorICAgICAgICAoQ29t bWl0LmZyb21fanNvbik6IFBhc3MgaGFzaCBhbmQgcmV2aXNpb24gdmlhIGpzb24uCisgICAgICAg IChDb21taXQuX19pbml0X18pOiBDb252ZXJ0IGlkIHRvIGhhc2ggb3IgcmV2aXNpb24uCisKIDIw MjEtMDItMTUgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBg Z2l0IGNvbW1pdCAtdmAgc3VwcG9ydCB0byBjb21taXQtbG9nLWVkaXRvcgpJbmRleDogVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvY29udHJvbGxlci9jb21t aXQucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkv cmVzdWx0c2RicHkvY29udHJvbGxlci9jb21taXQucHkJKHJldmlzaW9uIDI3Mjg1OCkKKysrIFRv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L2NvbnRyb2xsZXIv Y29tbWl0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zOSwxMyArMzksMTUgQEAgY2xhc3MgQ29tbWl0 KG9iamVjdCk6CiAgICAgICAgICAgICByZXBvc2l0b3J5X2lkPWRhdGEuZ2V0KCdyZXBvc2l0b3J5 X2lkJyksCiAgICAgICAgICAgICBicmFuY2g9ZGF0YS5nZXQoJ2JyYW5jaCcpLAogICAgICAgICAg ICAgaWQ9ZGF0YS5nZXQoJ2lkJyksCisgICAgICAgICAgICByZXZpc2lvbj1kYXRhLmdldCgncmV2 aXNpb24nKSwKKyAgICAgICAgICAgIGhhc2g9ZGF0YS5nZXQoJ2hhc2gnKSwKICAgICAgICAgICAg IHRpbWVzdGFtcD1kYXRhLmdldCgndGltZXN0YW1wJyksCiAgICAgICAgICAgICBvcmRlcj1kYXRh LmdldCgnb3JkZXInKSwKICAgICAgICAgICAgIGNvbW1pdHRlcj1kYXRhLmdldCgnY29tbWl0dGVy JyksCiAgICAgICAgICAgICBtZXNzYWdlPWRhdGEuZ2V0KCdtZXNzYWdlJyksCiAgICAgICAgICkK IAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCByZXBvc2l0b3J5X2lkLCBicmFuY2gsIGlkLCB0aW1l c3RhbXA9Tm9uZSwgb3JkZXI9Tm9uZSwgY29tbWl0dGVyPU5vbmUsIG1lc3NhZ2U9Tm9uZSk6Cisg ICAgZGVmIF9faW5pdF9fKHNlbGYsIHJlcG9zaXRvcnlfaWQsIGJyYW5jaCwgaWQsIHRpbWVzdGFt cD1Ob25lLCBvcmRlcj1Ob25lLCBjb21taXR0ZXI9Tm9uZSwgbWVzc2FnZT1Ob25lLCByZXZpc2lv bj1Ob25lLCBoYXNoPU5vbmUpOgogICAgICAgICBmb3IgYXJndW1lbnQgaW4gWygncmVwb3NpdG9y eV9pZCcsIHJlcG9zaXRvcnlfaWQpLCAoJ2JyYW5jaCcsIGJyYW5jaCksICgnaWQnLCBpZCksICgn dGltZXN0YW1wJywgdGltZXN0YW1wKV06CiAgICAgICAgICAgICBpZiBhcmd1bWVudFsxXSBpcyBO b25lOgogICAgICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoZid7YXJndW1lbnRbMF19IGlz IG5vdCBkZWZpbmVkIGZvciBjb21taXQnKQpAQCAtNjMsNiArNjUsMjMgQEAgY2xhc3MgQ29tbWl0 KG9iamVjdCk6CiAgICAgICAgIGlmIG5vdCByZS5tYXRjaChyJ15bYS1mQS1GMC05P10rJCcsIHNl bGYuaWQpIG9yIGxlbihzZWxmLmlkKSA+IDQwOgogICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJv cihmIid7c2VsZi5pZH0nIGlzIGFuIGludmFsaWQgY29tbWl0IGlkIikKIAorICAgICAgICBzZWxm LnJldmlzaW9uID0gcmV2aXNpb24KKyAgICAgICAgc2VsZi5oYXNoID0gaGFzaAorICAgICAgICBp ZiByZS5tYXRjaChyJ1swLTldKyQnLCBzZWxmLmlkKToKKyAgICAgICAgICAgIGlmIG5vdCBzZWxm LnJldmlzaW9uOgorICAgICAgICAgICAgICAgIHNlbGYucmV2aXNpb24gPSBzZWxmLmlkCisgICAg ICAgIGVsaWYgcmUubWF0Y2gocidbYS1mQS1GMC05XSskJywgc2VsZi5pZCk6CisgICAgICAgICAg ICBpZiBub3Qgc2VsZi5oYXNoOgorICAgICAgICAgICAgICAgIHNlbGYuaGFzaCA9IHNlbGYuaWQK KworICAgICAgICBpZiBzZWxmLnJldmlzaW9uOgorICAgICAgICAgICAgdHJ5OgorICAgICAgICAg ICAgICAgIHNlbGYucmV2aXNpb24gPSBpbnQoc2VsZi5yZXZpc2lvbikKKyAgICAgICAgICAgIGV4 Y2VwdCBWYWx1ZUVycm9yOgorICAgICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoZiIne3Nl bGYucmV2aXNpb259JyBpcyBub3QgYW4gaW50ZWdlciIpCisgICAgICAgIGlmIHNlbGYuaGFzaDoK KyAgICAgICAgICAgIHNlbGYuaGFzaCA9IHNlbGYuaGFzaC5sb3dlcigpCisKICAgICAgICAgaWYg aXNpbnN0YW5jZSh0aW1lc3RhbXAsIGRhdGV0aW1lKToKICAgICAgICAgICAgIHNlbGYudGltZXN0 YW1wID0gdGltZXN0YW1wCiAgICAgICAgIGVsc2U6Cg== 420333 2021-02-15 10:45:46 -0800 2021-02-15 11:58:40 -0800 Patch bug-221861-20210215104545.patch text/plain 3129 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3Mjg2MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDIxLTAyLTE1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcmVzdWx0cy53ZWJraXQub3JnXSBEaXN0aW5ndWlzaCBoYXNoIGFuZCBy ZXZpc2lvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjIxODYxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDI5ODQ1Nz4KKworICAgICAgICBSZXZp ZXdlZCBieSBBYWthc2ggSmFpbi4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3Jlc3Vs dHNkYnB5L3Jlc3VsdHNkYnB5L2NvbnRyb2xsZXIvY29tbWl0LnB5OgorICAgICAgICAoQ29tbWl0 LmZyb21fanNvbik6IFBhc3MgaGFzaCBhbmQgcmV2aXNpb24gdmlhIGpzb24uCisgICAgICAgIChD b21taXQuX19pbml0X18pOiBDb252ZXJ0IGlkIHRvIGhhc2ggb3IgcmV2aXNpb24uCisKIDIwMjEt MDItMTUgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBgZ2l0 IGNvbW1pdCAtdmAgc3VwcG9ydCB0byBjb21taXQtbG9nLWVkaXRvcgpJbmRleDogVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvY29udHJvbGxlci9jb21taXQu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvcmVzdWx0c2RicHkvcmVz dWx0c2RicHkvY29udHJvbGxlci9jb21taXQucHkJKHJldmlzaW9uIDI3Mjg2MikKKysrIFRvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L2NvbnRyb2xsZXIvY29t bWl0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiw5IEBAIGNsYXNzIENvbW1pdChvYmpl Y3QpOgogICAgIFRJTUVTVEFNUF9UT19VVUlEX01VTFRJUExJRVIgPSAxMDAKICAgICBNQVhfS0VZ X0xFTkdUSCA9IDEyOAogCisgICAgUkVWSVNJT05fUkUgPSByZS5jb21waWxlKHInWzAtOV0rJCcp CisgICAgSEFTSF9SRSA9IHJlLmNvbXBpbGUocidbYS1mQS1GMC05XSskJykKKwogICAgIEBjbGFz c21ldGhvZAogICAgIGRlZiBmcm9tX2pzb24oY2xzLCBkYXRhKToKICAgICAgICAgZGF0YSA9IGRh dGEgaWYgaXNpbnN0YW5jZShkYXRhLCBkaWN0KSBlbHNlIGpzb24ubG9hZHMoZGF0YSkKQEAgLTM5 LDEzICs0MiwxNSBAQCBjbGFzcyBDb21taXQob2JqZWN0KToKICAgICAgICAgICAgIHJlcG9zaXRv cnlfaWQ9ZGF0YS5nZXQoJ3JlcG9zaXRvcnlfaWQnKSwKICAgICAgICAgICAgIGJyYW5jaD1kYXRh LmdldCgnYnJhbmNoJyksCiAgICAgICAgICAgICBpZD1kYXRhLmdldCgnaWQnKSwKKyAgICAgICAg ICAgIHJldmlzaW9uPWRhdGEuZ2V0KCdyZXZpc2lvbicpLAorICAgICAgICAgICAgaGFzaD1kYXRh LmdldCgnaGFzaCcpLAogICAgICAgICAgICAgdGltZXN0YW1wPWRhdGEuZ2V0KCd0aW1lc3RhbXAn KSwKICAgICAgICAgICAgIG9yZGVyPWRhdGEuZ2V0KCdvcmRlcicpLAogICAgICAgICAgICAgY29t bWl0dGVyPWRhdGEuZ2V0KCdjb21taXR0ZXInKSwKICAgICAgICAgICAgIG1lc3NhZ2U9ZGF0YS5n ZXQoJ21lc3NhZ2UnKSwKICAgICAgICAgKQogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHJlcG9z aXRvcnlfaWQsIGJyYW5jaCwgaWQsIHRpbWVzdGFtcD1Ob25lLCBvcmRlcj1Ob25lLCBjb21taXR0 ZXI9Tm9uZSwgbWVzc2FnZT1Ob25lKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcmVwb3NpdG9y eV9pZCwgYnJhbmNoLCBpZCwgdGltZXN0YW1wPU5vbmUsIG9yZGVyPU5vbmUsIGNvbW1pdHRlcj1O b25lLCBtZXNzYWdlPU5vbmUsIHJldmlzaW9uPU5vbmUsIGhhc2g9Tm9uZSk6CiAgICAgICAgIGZv ciBhcmd1bWVudCBpbiBbKCdyZXBvc2l0b3J5X2lkJywgcmVwb3NpdG9yeV9pZCksICgnYnJhbmNo JywgYnJhbmNoKSwgKCdpZCcsIGlkKSwgKCd0aW1lc3RhbXAnLCB0aW1lc3RhbXApXToKICAgICAg ICAgICAgIGlmIGFyZ3VtZW50WzFdIGlzIE5vbmU6CiAgICAgICAgICAgICAgICAgcmFpc2UgVmFs dWVFcnJvcihmJ3thcmd1bWVudFswXX0gaXMgbm90IGRlZmluZWQgZm9yIGNvbW1pdCcpCkBAIC02 Myw2ICs2OCwyMyBAQCBjbGFzcyBDb21taXQob2JqZWN0KToKICAgICAgICAgaWYgbm90IHJlLm1h dGNoKHInXlthLWZBLUYwLTk/XSskJywgc2VsZi5pZCkgb3IgbGVuKHNlbGYuaWQpID4gNDA6CiAg ICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKGYiJ3tzZWxmLmlkfScgaXMgYW4gaW52YWxpZCBj b21taXQgaWQiKQogCisgICAgICAgIHNlbGYucmV2aXNpb24gPSByZXZpc2lvbgorICAgICAgICBz ZWxmLmhhc2ggPSBoYXNoCisgICAgICAgIGlmIHNlbGYuUkVWSVNJT05fUkUubWF0Y2goc2VsZi5p ZCk6CisgICAgICAgICAgICBpZiBub3Qgc2VsZi5yZXZpc2lvbjoKKyAgICAgICAgICAgICAgICBz ZWxmLnJldmlzaW9uID0gc2VsZi5pZAorICAgICAgICBlbGlmIHNlbGYuSEFTSF9SRS5tYXRjaChz ZWxmLmlkKToKKyAgICAgICAgICAgIGlmIG5vdCBzZWxmLmhhc2g6CisgICAgICAgICAgICAgICAg c2VsZi5oYXNoID0gc2VsZi5pZAorCisgICAgICAgIGlmIHNlbGYucmV2aXNpb246CisgICAgICAg ICAgICB0cnk6CisgICAgICAgICAgICAgICAgc2VsZi5yZXZpc2lvbiA9IGludChzZWxmLnJldmlz aW9uKQorICAgICAgICAgICAgZXhjZXB0IFZhbHVlRXJyb3I6CisgICAgICAgICAgICAgICAgcmFp c2UgVmFsdWVFcnJvcihmIid7c2VsZi5yZXZpc2lvbn0nIGlzIG5vdCBhbiBpbnRlZ2VyIikKKyAg ICAgICAgaWYgc2VsZi5oYXNoOgorICAgICAgICAgICAgc2VsZi5oYXNoID0gc2VsZi5oYXNoLmxv d2VyKCkKKwogICAgICAgICBpZiBpc2luc3RhbmNlKHRpbWVzdGFtcCwgZGF0ZXRpbWUpOgogICAg ICAgICAgICAgc2VsZi50aW1lc3RhbXAgPSB0aW1lc3RhbXAKICAgICAgICAgZWxzZToK