218032 2020-10-21 09:32:39 -0700 webkitpy: Check for duplicated keys in json expectation files 2020-10-21 11:34:20 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 lmoura lmoura bugs-noreply clopez ews-watchlist glenn jbedard webkit-bug-importer oldest_to_newest 1700227 0 lmoura 2020-10-21 09:32:39 -0700 webkitpy: Check for duplicated keys in json expectation files 1700231 1 411997 lmoura 2020-10-21 09:36:03 -0700 Created attachment 411997 Patch 1700293 2 ews-feeder 2020-10-21 11:33:22 -0700 Committed r268811: <https://trac.webkit.org/changeset/268811> All reviewed patches have been landed. Closing bug and clearing flags on attachment 411997. 1700294 3 webkit-bug-importer 2020-10-21 11:34:20 -0700 <rdar://problem/70538125> 411997 2020-10-21 09:36:03 -0700 2020-10-21 11:33:23 -0700 Patch bug-218032-20201021133602.patch text/plain 6249 lmoura U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4Nzk1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjA3YWIwNTZkMjQ4Y2YzYWQ2YTQyZTdlMGY5MTIxYjZk Zjk3OGY2My4uMGU0NjNkN2IyZGZhOTE5MTRhYTRjNzE1ODEzOWI5YTg1ZWJlNWNmZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDIwLTEwLTIxICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIHdlYmtpdHB5OiBDaGVjayBmb3IgZHVwbGljYXRlZCBrZXlzIGluIGpzb24gZXhwZWN0YXRp b24gZmlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxODAzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFdoZW4gSlNPTiBjb250YWlucyByZXBlYXRlZCBrZXlzLCBQeXRob24gb25seSB1c2VzIHRoZSBs YXN0IGtleS92YWx1ZQorICAgICAgICBwYWlyIGluIHRoZSByZXN1bHRpbmcgZGljdCwgd2l0aG91 dCB3YXJuaW5ncy4gVGhpcyBtYXkgY2F1c2Ugc29tZQorICAgICAgICBleHBlY3RhdGlvbnMgdG8g YmUgaWdub3JlZCwgbGlrZSB3aGF0IHIyNjczMjMgZml4ZWQuCisKKyAgICAgICAgVGhpcyBjaGFu Z2UgYWxzbyBtYWtlcyBNb2NrVGVzdEV4cGVjdGF0aW9ucyB1c2UgdGhlIHNhbWUgbG9hZGluZwor ICAgICAgICB2YWxpZGF0aW9uIGFzIHRoZSBhY3R1YWwgZXhwZWN0YXRpb24gaW5zdGVhZCBvZiBj YWxsaW5nIGpzb24ubG9hZHMKKyAgICAgICAgZGlyZWN0bHkuCisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi90ZXN0X2V4cGVjdGF0aW9ucy5weToKKyAgICAgICAgKGNoZWNrX3Jl cGVhdGVkX2tleXMpOiBBZGRlZC4KKyAgICAgICAgKFRlc3RFeHBlY3RhdGlvbnMuX19pbml0X18p OiBVc2UgaGVscGVyIGZ1bmN0aW9uLgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9ucy5fbG9hZF9l eHBlY3RhdGlvbl9zdHJpbmcpOiBNb3ZlZCB2YWxpZGF0aW9uIGhlcmUuCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9jb21tb24vdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHk6CisgICAg ICAgIChNb2NrVGVzdEV4cGVjdGF0aW9ucy5fX2luaXRfXyk6IFVzZSBoZWxwZXIgZnVuY3Rpb24u CisgICAgICAgICh0ZXN0X3JlcGVhdGVkX2tleXMpOiBBZGRlZCB0ZXN0IHdoZW4gdGhlcmUgYXJl IHJlcGVhdGVkIGtleXMuCisKIDIwMjAtMTAtMjAgIExhdXJvIE1vdXJhICA8bG1vdXJhQGlnYWxp YS5jb20+CiAKICAgICAgICAgd2Via2l0cHk6IEZpeCB3ZWJkcml2ZXIgbG9nZ2luZyBtZXNzYWdl CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi90ZXN0X2V4cGVjdGF0 aW9ucy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3Rlc3RfZXhwZWN0YXRpb25z LnB5CmluZGV4IDdjZDcwMzFhNTRkYjE3NDAyN2ZhMzMzOTRlY2Y3ZGE4NmUzZGFhY2YuLmZmNmUw YjAzNmVjZGE0YzNhMzgxNGU4NmMyZmYxMGRhNTQxN2ViMjcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL3Rlc3RfZXhwZWN0YXRpb25zLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL3Rlc3RfZXhwZWN0YXRpb25zLnB5CkBAIC0yNCw2ICsyNCwx NyBAQCBpbXBvcnQganNvbgogaW1wb3J0IG9zCiAKIAorZGVmIGNoZWNrX3JlcGVhdGVkX2tleXMo YXJncyk6CisgICAgc2VlbiA9IHt9CisgICAgZm9yIGtleSwgdmFsIGluIGFyZ3M6CisgICAgICAg IGlmIGtleSBpbiBzZWVuOgorICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcigiS2V5ICVzIGFw cGVhcnMgbW9yZSB0aGFuIG9uY2UiICUga2V5KQorICAgICAgICBlbHNlOgorICAgICAgICAgICAg c2VlbltrZXldID0gdmFsCisKKyAgICByZXR1cm4gc2VlbgorCisKIGNsYXNzIFRlc3RFeHBlY3Rh dGlvbnMob2JqZWN0KToKIAogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0X25hbWUsIGV4cGVj dGF0aW9uc19maWxlLCBidWlsZF90eXBlPSdSZWxlYXNlJyk6CkBAIC0zMSwxMCArNDIsMTMgQEAg Y2xhc3MgVGVzdEV4cGVjdGF0aW9ucyhvYmplY3QpOgogICAgICAgICBzZWxmLl9idWlsZF90eXBl ID0gYnVpbGRfdHlwZQogICAgICAgICBpZiBvcy5wYXRoLmlzZmlsZShleHBlY3RhdGlvbnNfZmls ZSk6CiAgICAgICAgICAgICB3aXRoIG9wZW4oZXhwZWN0YXRpb25zX2ZpbGUsICdyJykgYXMgZmQ6 Ci0gICAgICAgICAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zID0ganNvbi5sb2FkKGZkKQorICAg ICAgICAgICAgICAgIHNlbGYuX2V4cGVjdGF0aW9ucyA9IHNlbGYuX2xvYWRfZXhwZWN0YXRpb25f c3RyaW5nKGZkLnJlYWQoKSkKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHNlbGYuX2V4cGVj dGF0aW9ucyA9IHt9CiAKKyAgICBkZWYgX2xvYWRfZXhwZWN0YXRpb25fc3RyaW5nKHNlbGYsIGV4 cGVjdGF0aW9ucyk6CisgICAgICAgIHJldHVybiBqc29uLmxvYWRzKGV4cGVjdGF0aW9ucywgb2Jq ZWN0X3BhaXJzX2hvb2s9Y2hlY2tfcmVwZWF0ZWRfa2V5cykKKwogICAgIGRlZiBfcG9ydF9uYW1l X2Zvcl9leHBlY3RlZChzZWxmLCBleHBlY3RlZCk6CiAgICAgICAgIGlmIHNlbGYuX3BvcnRfbmFt ZSBpbiBleHBlY3RlZDoKICAgICAgICAgICAgIHJldHVybiBzZWxmLl9wb3J0X25hbWUKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3Rlc3RfZXhwZWN0YXRpb25zX3Vu aXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vdGVzdF9leHBlY3RhdGlv bnNfdW5pdHRlc3QucHkKaW5kZXggOTY0MDY4YTQ5YjRjYjg1NjRlYWY2MWUyOWZjMjdkNmJiOTMy YmU0Zi4uMDgxNmVjOTg4YzFhM2U4NjdlMjA5YThkNjY5Y2RlYzVmYmRlNThkNiAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRl c3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vdGVzdF9leHBlY3RhdGlv bnNfdW5pdHRlc3QucHkKQEAgLTM3LDcgKzM3LDcgQEAgY2xhc3MgTW9ja1Rlc3RFeHBlY3RhdGlv bnMoVGVzdEV4cGVjdGF0aW9ucyk6CiAgICAgICAgIHBvcnQgPSBob3N0LnBvcnRfZmFjdG9yeS5n ZXQocG9ydCkKICAgICAgICAgc2VsZi5fcG9ydF9uYW1lID0gcG9ydC5uYW1lKCkKICAgICAgICAg c2VsZi5fYnVpbGRfdHlwZSA9IGJ1aWxkX3R5cGUKLSAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25z ID0ganNvbi5sb2FkcyhleHBlY3RhdGlvbnMpCisgICAgICAgIHNlbGYuX2V4cGVjdGF0aW9ucyA9 IHNlbGYuX2xvYWRfZXhwZWN0YXRpb25fc3RyaW5nKGV4cGVjdGF0aW9ucykKIAogICAgIGRlZiBp c19za2lwKHNlbGYsIHRlc3QsIHN1YnRlc3QpOgogICAgICAgICBpZiB0ZXN0IGluIHNlbGYuc2tp cHBlZF90ZXN0cygpOgpAQCAtMTg1LDYgKzE4NSwxOCBAQCBjbGFzcyBFeHBlY3RhdGlvbnNUZXN0 KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICB9CiB9IiIiCiAKKyAgICBSRVBFQVRFRF9LRVlTID0g IiIiCit7CisgICAgIlRlc3REdW1teSI6IHsKKyAgICAgICAgImEiOiAxCisgICAgfSwKKyAgICAi VGVzdEFub3RoZXIiOiB7CisgICAgfSwKKyAgICAiVGVzdER1bW15IjogeworICAgICAgICAiYSI6 IDIKKyAgICB9Cit9IiIiCisKICAgICBkZWYgYXNzZXJ0X2V4cChzZWxmLCB0ZXN0LCBzdWJ0ZXN0 LCByZXN1bHQpOgogICAgICAgICBzZWxmLmFzc2VydEluKHJlc3VsdCwgc2VsZi5leHBlY3RhdGlv bnMuZ2V0X2V4cGVjdGF0aW9uKHRlc3QsIHN1YnRlc3QpKQogCkBAIC0yOTMsMyArMzA1LDYgQEAg Y2xhc3MgRXhwZWN0YXRpb25zVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYu YXNzZXJ0X3Nsb3coJ1Rlc3RXZWJLaXQnLCAnV2ViS2l0LldLVmlldycsIEZhbHNlKQogICAgICAg ICBzZWxmLmFzc2VydF9zbG93KCdUZXN0V2ViS2l0JywgJ1dlYktpdC5Nb3VzZU1vdmVBZnRlckNy YXNoJywgVHJ1ZSkKICAgICAgICAgc2VsZi5hc3NlcnRfc2xvdygnVGVzdFdlYktpdCcsICdXZWJL aXQuV0tDb25uZWN0aW9uJywgRmFsc2UpCisKKyAgICBkZWYgdGVzdF9yZXBlYXRlZF9rZXlzKHNl bGYpOgorICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhWYWx1ZUVycm9yLCBsYW1iZGE6IE1vY2tU ZXN0RXhwZWN0YXRpb25zKCdndGsnLCBzZWxmLlJFUEVBVEVEX0tFWVMpKQpkaWZmIC0tZ2l0IGEv V2ViRHJpdmVyVGVzdHMvQ2hhbmdlTG9nIGIvV2ViRHJpdmVyVGVzdHMvQ2hhbmdlTG9nCmluZGV4 IGQ1NTFhYjU4YzY4NmNmNjIzMjE0MDFlMTFhNzc3NjAwY2YyM2ZmZmEuLmFiMmE4NDQwMmY5ODE3 ZDhlODQ5NmJhNjExMzEwNzNkNWYyZGJiNTcgMTAwNjQ0Ci0tLSBhL1dlYkRyaXZlclRlc3RzL0No YW5nZUxvZworKysgYi9XZWJEcml2ZXJUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor MjAyMC0xMC0yMSAgTGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4KKworICAgICAgICB3 ZWJraXRweTogQ2hlY2sgZm9yIGR1cGxpY2F0ZWQga2V5cyBpbiBqc29uIGV4cGVjdGF0aW9uIGZp bGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTgw MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRl c3RFeHBlY3RhdGlvbnMuanNvbjogRml4IGR1cGxpY2F0ZWQgdGVzdCBrZXkuCisKIDIwMjAtMTAt MjEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAg IFdlYkRyaXZlcjogYWRkIHN1cHBvcnQgZm9yIHdoZWVsIGFjdGlvbnMKZGlmZiAtLWdpdCBhL1dl YkRyaXZlclRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMuanNvbiBiL1dlYkRyaXZlclRlc3RzL1Rlc3RF eHBlY3RhdGlvbnMuanNvbgppbmRleCAyOWNhMDliYmYwYmQ1OGUwNGVhY2U2MTlmMzgxZGZjYzM4 ZmRjM2U4Li4zYzE4MzY4YTI2N2M0NzA2YmNlZDE2MmI2ZDNhMDdhNGI2MDJkMTI3IDEwMDY0NAot LS0gYS9XZWJEcml2ZXJUZXN0cy9UZXN0RXhwZWN0YXRpb25zLmpzb24KKysrIGIvV2ViRHJpdmVy VGVzdHMvVGVzdEV4cGVjdGF0aW9ucy5qc29uCkBAIC01MTQsNiArNTE0LDEyIEBACiAgICAgICAg ICJzdWJ0ZXN0cyI6IHsKICAgICAgICAgICAgICJ0ZXN0X2R1cGxpY2F0ZWRfY29va2llIjogewog ICAgICAgICAgICAgICAgICJleHBlY3RlZCI6IHsiYWxsIjogeyJzdGF0dXMiOiBbIkZBSUwiXSwg ImJ1ZyI6ICJ3ZWJraXQub3JnL2IvMTgyMzMwIn19CisgICAgICAgICAgICB9LAorICAgICAgICAg ICAgInRlc3Rfbm9fdG9wX2Jyb3dzaW5nX2NvbnRleHQiOiB7CisgICAgICAgICAgICAgICAgImV4 cGVjdGVkIjogeyJ3cGUiOiB7InN0YXR1cyI6IFsiRkFJTCJdLCAiYnVnIjogIndlYmtpdC5vcmcv Yi8yMTI5NTAifX0KKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICAidGVzdF9ub19icm93c2lu Z19jb250ZXh0IjogeworICAgICAgICAgICAgICAgICJleHBlY3RlZCI6IHsid3BlIjogeyJzdGF0 dXMiOiBbIkZBSUwiXSwgImJ1ZyI6ICJ3ZWJraXQub3JnL2IvMjEyOTUwIn19CiAgICAgICAgICAg ICB9CiAgICAgICAgIH0KICAgICB9LApAQCAtOTMzLDE3ICs5MzksNiBAQAogICAgICAgICB9CiAg ICAgfSwKIAotICAgICJpbXBvcnRlZC93M2Mvd2ViZHJpdmVyL3Rlc3RzL2dldF9uYW1lZF9jb29r aWUvZ2V0LnB5IjogewotICAgICAgICAic3VidGVzdHMiOiB7Ci0gICAgICAgICAgICAidGVzdF9u b190b3BfYnJvd3NpbmdfY29udGV4dCI6IHsKLSAgICAgICAgICAgICAgICAiZXhwZWN0ZWQiOiB7 IndwZSI6IHsic3RhdHVzIjogWyJGQUlMIl0sICJidWciOiAid2Via2l0Lm9yZy9iLzIxMjk1MCJ9 fQotICAgICAgICAgICAgfSwKLSAgICAgICAgICAgICJ0ZXN0X25vX2Jyb3dzaW5nX2NvbnRleHQi OiB7Ci0gICAgICAgICAgICAgICAgImV4cGVjdGVkIjogeyJ3cGUiOiB7InN0YXR1cyI6IFsiRkFJ TCJdLCAiYnVnIjogIndlYmtpdC5vcmcvYi8yMTI5NTAifX0KLSAgICAgICAgICAgIH0KLSAgICAg ICAgfQotICAgIH0sCi0KICAgICAiaW1wb3J0ZWQvdzNjL3dlYmRyaXZlci90ZXN0cy9nZXRfcGFn ZV9zb3VyY2Uvc291cmNlLnB5IjogewogICAgICAgICAic3VidGVzdHMiOiB7CiAgICAgICAgICAg ICAidGVzdF9ub190b3BfYnJvd3NpbmdfY29udGV4dCI6IHsK