153237 2016-01-19 10:35:01 -0800 Modern IDB: Split all storage/indexeddb/mozilla tests into separate HTML + JS format 2016-01-19 16:43:44 -0800 1 1 1 Unclassified WebKit WebCore Misc. Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149117 1 beidson beidson alecflett ap commit-queue jsbell sam oldest_to_newest 1156633 0 beidson 2016-01-19 10:35:01 -0800 Modern IDB: Split all storage/indexeddb/mozilla tests into separate HTML + JS format (This is only one test) 1156634 1 beidson 2016-01-19 10:35:14 -0800 (In reply to comment #0) > Modern IDB: Split all storage/indexeddb/mozilla tests into separate HTML + > JS format > > (This is only one test) I mean, only one test is not yet in this format. 1156642 2 269270 beidson 2016-01-19 10:43:24 -0800 Created attachment 269270 Patch v1 1156645 3 269270 sam 2016-01-19 10:46:48 -0800 Comment on attachment 269270 Patch v1 rs=me 1156664 4 269270 commit-queue 2016-01-19 11:35:42 -0800 Comment on attachment 269270 Patch v1 Clearing flags on attachment: 269270 Committed r195301: <http://trac.webkit.org/changeset/195301> 1156665 5 commit-queue 2016-01-19 11:35:46 -0800 All reviewed patches have been landed. Closing bug. 1156789 6 ap 2016-01-19 16:43:44 -0800 Is this because of workers? 269270 2016-01-19 10:43:24 -0800 2016-01-19 11:35:42 -0800 Patch v1 patch text/plain 14076 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxNTgzZmFmLi41NDRhYjEwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTYtMDEt MTkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIE1vZGVybiBJ REI6IFNwbGl0IGFsbCBzdG9yYWdlL2luZGV4ZWRkYi9tb3ppbGxhIHRlc3RzIGludG8gc2VwYXJh dGUgSFRNTCArIEpTIGZvcm1hdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1MzIzNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9pbmRleC1wcmV2LW5vLWR1 cGxpY2F0ZS5odG1sOgorICAgICAgICAqIHN0b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEvcmVzb3Vy Y2VzL2luZGV4LXByZXYtbm8tZHVwbGljYXRlLmpzOiBDb3BpZWQgZnJvbSBMYXlvdXRUZXN0cy9z dG9yYWdlL2luZGV4ZWRkYi9tb3ppbGxhL2luZGV4LXByZXYtbm8tZHVwbGljYXRlLmh0bWwuCisK IDIwMTYtMDEtMTkgIEphdmllciBGZXJuYW5kZXogIDxqZmVybmFuZGV6QGlnYWxpYS5jb20+CiAK ICAgICAgICAgW2Nzcy1ncmlkXVtjc3MtYWxpZ25dIGp1c3RpZnktc2VsZiBzdHJldGNoIGlzIG5v dCBhcHBsaWVkIGZvciBpbWcgZWxlbWVudHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3N0b3Jh Z2UvaW5kZXhlZGRiL21vemlsbGEvaW5kZXgtcHJldi1uby1kdXBsaWNhdGUuaHRtbCBiL0xheW91 dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEvaW5kZXgtcHJldi1uby1kdXBsaWNhdGUu aHRtbAppbmRleCBkMjUxN2MyLi5jMzIzY2QwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9zdG9y YWdlL2luZGV4ZWRkYi9tb3ppbGxhL2luZGV4LXByZXYtbm8tZHVwbGljYXRlLmh0bWwKKysrIGIv TGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9pbmRleC1wcmV2LW5vLWR1cGxp Y2F0ZS5odG1sCkBAIC0xMSwxNDcgKzExLDYgQEAKIDxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMv c2hhcmVkLmpzIj48L3NjcmlwdD4KIDwvaGVhZD4KIDxib2R5PgotPHNjcmlwdD4KLQotZGVzY3Jp cHRpb24oIlRlc3QgSW5kZXhlZERCOiBpdGVyYXRpbmcgYmFja3dhcmRzIHRocm91Z2ggYW4gaW5k ZXgsIHNraXBwaW5nIGR1cGxpY2F0ZXMiKTsKLQotaW5kZXhlZERCVGVzdChwcmVwYXJlRGF0YWJh c2UsIHRlc3RQcmV2KTsKLWZ1bmN0aW9uIHByZXBhcmVEYXRhYmFzZSgpCi17Ci0gICAgZGIgPSBl dmVudC50YXJnZXQucmVzdWx0OwotICAgIHRyYW5zID0gZXZlbnQudGFyZ2V0LnRyYW5zYWN0aW9u OwotCi0gICAgb2JqZWN0U3RvcmVOYW1lID0gIlBlb3BsZSI7Ci0KLSAgICBvYmplY3RTdG9yZURh dGEgPSBbCi0gICAgICAgIHsga2V5OiAiMjM3LTIzLTc3MzIiLCB2YWx1ZTogeyBuYW1lOiAiQm9i IiwgaGVpZ2h0OiA2MCwgd2VpZ2h0OiAxMjAgfSB9LAotICAgICAgICB7IGtleTogIjIzNy0yMy03 NzMzIiwgdmFsdWU6IHsgbmFtZTogIkFubiIsIGhlaWdodDogNTIsIHdlaWdodDogMTEwIH0gfSwK LSAgICAgICAgeyBrZXk6ICIyMzctMjMtNzczNCIsIHZhbHVlOiB7IG5hbWU6ICJSb24iLCBoZWln aHQ6IDczLCB3ZWlnaHQ6IDE4MCB9IH0sCi0gICAgICAgIHsga2V5OiAiMjM3LTIzLTc3MzUiLCB2 YWx1ZTogeyBuYW1lOiAiU3VlIiwgaGVpZ2h0OiA1OCwgd2VpZ2h0OiAxMzAgfSB9LAotICAgICAg ICB7IGtleTogIjIzNy0yMy03NzM2IiwgdmFsdWU6IHsgbmFtZTogIkpvZSIsIGhlaWdodDogNjUs IHdlaWdodDogMTUwIH0gfSwKLSAgICAgICAgeyBrZXk6ICIyMzctMjMtNzczNyIsIHZhbHVlOiB7 IG5hbWU6ICJQYXQiLCBoZWlnaHQ6IDY1LCB3ZWlnaHQ6IDEwMCB9IH0sCi0gICAgICAgIHsga2V5 OiAiMjM3LTIzLTc3MzgiLCB2YWx1ZTogeyBuYW1lOiAiTGVvIiwgaGVpZ2h0OiA2NSwgd2VpZ2h0 OiAxODAgfSB9LAotICAgICAgICB7IGtleTogIjIzNy0yMy03NzM5IiwgdmFsdWU6IHsgbmFtZTog IkplZiIsIGhlaWdodDogNjUsIHdlaWdodDogMTIwIH0gfSwKLSAgICAgICAgeyBrZXk6ICIyMzct MjMtNzc0MCIsIHZhbHVlOiB7IG5hbWU6ICJTYW0iLCBoZWlnaHQ6IDczLCB3ZWlnaHQ6IDExMCB9 IH0sCi0gICAgXTsKLQotICAgIGluZGV4RGF0YSA9IFsKLSAgICAgICAgeyBuYW1lOiAibmFtZSIs IGtleVBhdGg6ICJuYW1lIiwgb3B0aW9uczogeyB1bmlxdWU6IHRydWUgfSB9LAotICAgICAgICB7 IG5hbWU6ICJoZWlnaHQiLCBrZXlQYXRoOiAiaGVpZ2h0Iiwgb3B0aW9uczogeyB9IH0sCi0gICAg ICAgIHsgbmFtZTogIndlaWdodCIsIGtleVBhdGg6ICJ3ZWlnaHQiLCBvcHRpb25zOiB7IHVuaXF1 ZTogZmFsc2UgfSB9Ci0gICAgXTsKLQotICAgIG9iamVjdFN0b3JlRGF0YUhlaWdodFNvcnQgPSBb Ci0gICAgICAgIHsga2V5OiAiMjM3LTIzLTc3MzMiLCB2YWx1ZTogeyBuYW1lOiAiQW5uIiwgaGVp Z2h0OiA1Miwgd2VpZ2h0OiAxMTAgfSB9LAotICAgICAgICB7IGtleTogIjIzNy0yMy03NzM1Iiwg dmFsdWU6IHsgbmFtZTogIlN1ZSIsIGhlaWdodDogNTgsIHdlaWdodDogMTMwIH0gfSwKLSAgICAg ICAgeyBrZXk6ICIyMzctMjMtNzczMiIsIHZhbHVlOiB7IG5hbWU6ICJCb2IiLCBoZWlnaHQ6IDYw LCB3ZWlnaHQ6IDEyMCB9IH0sCi0gICAgICAgIHsga2V5OiAiMjM3LTIzLTc3MzYiLCB2YWx1ZTog eyBuYW1lOiAiSm9lIiwgaGVpZ2h0OiA2NSwgd2VpZ2h0OiAxNTAgfSB9LAotICAgICAgICB7IGtl eTogIjIzNy0yMy03NzM3IiwgdmFsdWU6IHsgbmFtZTogIlBhdCIsIGhlaWdodDogNjUsIHdlaWdo dDogMTAwIH0gfSwKLSAgICAgICAgeyBrZXk6ICIyMzctMjMtNzczOCIsIHZhbHVlOiB7IG5hbWU6 ICJMZW8iLCBoZWlnaHQ6IDY1LCB3ZWlnaHQ6IDE4MCB9IH0sCi0gICAgICAgIHsga2V5OiAiMjM3 LTIzLTc3MzkiLCB2YWx1ZTogeyBuYW1lOiAiSmVmIiwgaGVpZ2h0OiA2NSwgd2VpZ2h0OiAxMjAg fSB9LAotICAgICAgICB7IGtleTogIjIzNy0yMy03NzM0IiwgdmFsdWU6IHsgbmFtZTogIlJvbiIs IGhlaWdodDogNzMsIHdlaWdodDogMTgwIH0gfSwKLSAgICAgICAgeyBrZXk6ICIyMzctMjMtNzc0 MCIsIHZhbHVlOiB7IG5hbWU6ICJTYW0iLCBoZWlnaHQ6IDczLCB3ZWlnaHQ6IDExMCB9IH0sCi0g ICAgXTsKLQotICAgIG9iamVjdFN0b3JlID0gZXZhbEFuZExvZygib2JqZWN0U3RvcmUgPSBkYi5j cmVhdGVPYmplY3RTdG9yZShvYmplY3RTdG9yZU5hbWUpOyIpOwotICAgIGRlYnVnKCJGaXJzdCwg YWRkIGFsbCBvdXIgZGF0YSB0byB0aGUgb2JqZWN0IHN0b3JlLiIpOwotICAgIGFkZGVkRGF0YSA9 IDA7Ci0gICAgZm9yIChpIGluIG9iamVjdFN0b3JlRGF0YSkgewotICAgICAgcmVxdWVzdCA9IGV2 YWxBbmRMb2coInJlcXVlc3QgPSBvYmplY3RTdG9yZS5hZGQob2JqZWN0U3RvcmVEYXRhW2ldLnZh bHVlLCBvYmplY3RTdG9yZURhdGFbaV0ua2V5KTsiKTsKLSAgICAgIHJlcXVlc3Qub25lcnJvciA9 IHVuZXhwZWN0ZWRFcnJvckNhbGxiYWNrOwotICAgICAgcmVxdWVzdC5vbnN1Y2Nlc3MgPSBmdW5j dGlvbihldmVudCkKLSAgICAgIHsKLSAgICAgICAgaWYgKCsrYWRkZWREYXRhID09IG9iamVjdFN0 b3JlRGF0YS5sZW5ndGgpIHsKLSAgICAgICAgICBjcmVhdGVJbmRleGVzKCk7Ci0gICAgICAgIH0K LSAgICAgIH0KLSAgICB9Ci0gICAgdHJhbnMub25jb21wbGV0ZSA9IGZ1bmN0aW9uKCkgewotICAg ICAgICBldmFsQW5kTG9nKCJ0cmFucyA9IGRiLnRyYW5zYWN0aW9uKG9iamVjdFN0b3JlTmFtZSwg J3JlYWR3cml0ZScpIik7Ci0gICAgICAgIGV2YWxBbmRMb2coIm9iamVjdFN0b3JlID0gdHJhbnMu b2JqZWN0U3RvcmUob2JqZWN0U3RvcmVOYW1lKSIpOwotICAgIH07Ci19Ci0KLWZ1bmN0aW9uIGNy ZWF0ZUluZGV4ZXMoKQotewotICAgIGRlYnVnKCJOb3cgY3JlYXRlIHRoZSBpbmRleGVzLiIpOwot ICAgIGZvciAoaSBpbiBpbmRleERhdGEpIHsKLSAgICAgIGV2YWxBbmRMb2coIm9iamVjdFN0b3Jl LmNyZWF0ZUluZGV4KGluZGV4RGF0YVtpXS5uYW1lLCBpbmRleERhdGFbaV0ua2V5UGF0aCwgaW5k ZXhEYXRhW2ldLm9wdGlvbnMpOyIpOwotICAgIH0KLX0KLQotZnVuY3Rpb24gdGVzdFByZXYoKQot ewotICAgIGRlYnVnKCJ0ZXN0UHJldigpIik7Ci0gICAgdHJhbnMgPSBldmFsQW5kTG9nKCJ0cmFu cyA9IGRiLnRyYW5zYWN0aW9uKG9iamVjdFN0b3JlTmFtZSkiKTsKLSAgICBvYmplY3RTdG9yZSA9 IGV2YWxBbmRMb2coIm9iamVjdFN0b3JlID0gdHJhbnMub2JqZWN0U3RvcmUob2JqZWN0U3RvcmVO YW1lKTsiKTsKLSAgICBrZXlJbmRleCA9IGV2YWxBbmRMb2coImtleUluZGV4ID0gODsiKTsKLSAg ICAvLyBmaXJzdCB0cnkgd2l0aCBqdXN0IFBSRVYKLSAgICByZXF1ZXN0ID0gZXZhbEFuZExvZygi cmVxdWVzdCA9IG9iamVjdFN0b3JlLmluZGV4KCdoZWlnaHQnKS5vcGVuQ3Vyc29yKG51bGwsICdw cmV2Jyk7Iik7Ci0gICAgcmVxdWVzdC5vbmVycm9yID0gdW5leHBlY3RlZEVycm9yQ2FsbGJhY2s7 Ci0gICAgcmVxdWVzdC5vbnN1Y2Nlc3MgPSBmdW5jdGlvbihldmVudCkKLSAgICB7Ci0gICAgICAg IGN1cnNvciA9IGV2YWxBbmRMb2coImN1cnNvciA9IGV2ZW50LnRhcmdldC5yZXN1bHQ7Iik7Ci0g ICAgICAgIGlmIChjdXJzb3IpIHsKLSAgICAgICAgICAgIHNob3VsZEJlKCJjdXJzb3Iua2V5Iiwg IiIgKyBvYmplY3RTdG9yZURhdGFIZWlnaHRTb3J0W2tleUluZGV4XS52YWx1ZS5oZWlnaHQpOwot ICAgICAgICAgICAgc2hvdWxkQmUoImN1cnNvci5wcmltYXJ5S2V5IiwgIiciICsgb2JqZWN0U3Rv cmVEYXRhSGVpZ2h0U29ydFtrZXlJbmRleF0ua2V5ICsgIiciKTsKLSAgICAgICAgICAgIHNob3Vs ZEJlKCJjdXJzb3IudmFsdWUubmFtZSIsICInIiArIG9iamVjdFN0b3JlRGF0YUhlaWdodFNvcnRb a2V5SW5kZXhdLnZhbHVlLm5hbWUgKyAiJyIpOwotICAgICAgICAgICAgc2hvdWxkQmUoImN1cnNv ci52YWx1ZS5oZWlnaHQiLCAiIiArIG9iamVjdFN0b3JlRGF0YUhlaWdodFNvcnRba2V5SW5kZXhd LnZhbHVlLmhlaWdodCk7Ci0gICAgICAgICAgICBpZiAoJ3dlaWdodCcgaW4gY3Vyc29yLnZhbHVl KSB7Ci0gICAgICAgICAgICAgICAgc2hvdWxkQmUoImN1cnNvci52YWx1ZS53ZWlnaHQiLCAiIiAr IG9iamVjdFN0b3JlRGF0YUhlaWdodFNvcnRba2V5SW5kZXhdLnZhbHVlLndlaWdodCk7Ci0gICAg ICAgICAgICB9Ci0KLSAgICAgICAgICAgIGV2YWxBbmRMb2coImN1cnNvci5jb250aW51ZSgpOyIp OwotICAgICAgICAgICAgZXZhbEFuZExvZygia2V5SW5kZXgtLTsiKTsKLSAgICAgICAgICAgIGRl YnVnKCIgID0+ICIgKyBrZXlJbmRleCk7Ci0gICAgICAgIH0KLSAgICAgICAgZWxzZSB7Ci0gICAg ICAgICAgICBkZWJ1ZygiTm8gY3Vyc29yOiAiICsgY3Vyc29yKTsKLSAgICAgICAgICAgIHNob3Vs ZEJlKCJrZXlJbmRleCIsICItMSIpOwotICAgICAgICB9Ci0gICAgfTsKLSAgICB0cmFucy5vbmNv bXBsZXRlID0gdGVzdFByZXZOb0R1cGxpY2F0ZTsKLX0KLQotZnVuY3Rpb24gdGVzdFByZXZOb0R1 cGxpY2F0ZSgpCi17Ci0gICAgZGVidWcoInRlc3RQcmV2Tm9EdXBsaWNhdGUoKSIpOwotICAgIG9i amVjdFN0b3JlID0gZXZhbEFuZExvZygib2JqZWN0U3RvcmUgPSBkYi50cmFuc2FjdGlvbihvYmpl Y3RTdG9yZU5hbWUpLm9iamVjdFN0b3JlKG9iamVjdFN0b3JlTmFtZSk7Iik7Ci0gICAga2V5SW5k ZXggPSBldmFsQW5kTG9nKCJrZXlJbmRleCA9IDg7Iik7Ci0gICAgcmVxdWVzdCA9IGV2YWxBbmRM b2coInJlcXVlc3QgPSBvYmplY3RTdG9yZS5pbmRleCgnaGVpZ2h0Jykub3BlbkN1cnNvcihudWxs LCAncHJldnVuaXF1ZScpOyIpOwotICAgIHJlcXVlc3Qub25lcnJvciA9IHVuZXhwZWN0ZWRFcnJv ckNhbGxiYWNrOwotICAgIHJlcXVlc3Qub25zdWNjZXNzID0gZnVuY3Rpb24gKGV2ZW50KQotICAg IHsKLSAgICAgICAgY3Vyc29yID0gZXZhbEFuZExvZygiY3Vyc29yID0gZXZlbnQudGFyZ2V0LnJl c3VsdDsiKTsKLSAgICAgICAgICAgIGlmIChrZXlJbmRleCA9PSA4KSB7Ci0gICAgICAgICAgICAg ICAgZXZhbEFuZExvZygia2V5SW5kZXggLT0gMSIpOwotICAgICAgICAgICAgfQotICAgICAgICAg ICAgaWYgKGtleUluZGV4ID09IDYpIHsKLSAgICAgICAgICAgICAgICBldmFsQW5kTG9nKCJrZXlJ bmRleCAtPSAzOyIpOwotICAgICAgICAgICAgfQotICAgICAgICBkZWJ1ZygiICA9PiBFbnRlcmlu ZyB3aXRoIGtleUluZGV4ID0gIiArIGtleUluZGV4KTsKLSAgICAgICAgaWYgKGN1cnNvcikgewot ICAgICAgICAgICAgc2hvdWxkQmUoImN1cnNvci5rZXkiLCAiIiArIG9iamVjdFN0b3JlRGF0YUhl aWdodFNvcnRba2V5SW5kZXhdLnZhbHVlLmhlaWdodCk7Ci0gICAgICAgICAgICBzaG91bGRCZSgi Y3Vyc29yLnByaW1hcnlLZXkiLCAiJyIgKyBvYmplY3RTdG9yZURhdGFIZWlnaHRTb3J0W2tleUlu ZGV4XS5rZXkgKyAiJyIpOwotICAgICAgICAgICAgc2hvdWxkQmUoImN1cnNvci52YWx1ZS5uYW1l IiwgIiciICsgb2JqZWN0U3RvcmVEYXRhSGVpZ2h0U29ydFtrZXlJbmRleF0udmFsdWUubmFtZSAr ICInIik7Ci0gICAgICAgICAgICBzaG91bGRCZSgiY3Vyc29yLnZhbHVlLmhlaWdodCIsICIiICsg b2JqZWN0U3RvcmVEYXRhSGVpZ2h0U29ydFtrZXlJbmRleF0udmFsdWUuaGVpZ2h0KTsKLSAgICAg ICAgICAgIGlmICgnd2VpZ2h0JyBpbiBjdXJzb3IudmFsdWUpIHsKLSAgICAgICAgICAgICAgICBz aG91bGRCZSgiY3Vyc29yLnZhbHVlLndlaWdodCIsICIiICsgb2JqZWN0U3RvcmVEYXRhSGVpZ2h0 U29ydFtrZXlJbmRleF0udmFsdWUud2VpZ2h0KTsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAg ICAgZXZhbEFuZExvZygiY3Vyc29yLmNvbnRpbnVlKCk7Iik7Ci0gICAgICAgICAgICBldmFsQW5k TG9nKCJrZXlJbmRleC0tOyIpOwotICAgICAgICB9Ci0gICAgICAgIGVsc2UgewotICAgICAgICAg ICAgZGVidWcoIk5vIGN1cnNvcjogIiArIGN1cnNvcik7Ci0gICAgICAgICAgICBzaG91bGRCZSgi a2V5SW5kZXgiLCAiLTEiKTsKLSAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOwotICAgICAgICB9 Ci0gICAgfQotfQotCi12YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsKLQotPC9zY3JpcHQ+ Cis8c2NyaXB0IHNyYz0icmVzb3VyY2VzL2luZGV4LXByZXYtbm8tZHVwbGljYXRlLmpzIj48L3Nj cmlwdD4KIDwvYm9keT4KIDwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3N0b3JhZ2Uv aW5kZXhlZGRiL21vemlsbGEvcmVzb3VyY2VzL2luZGV4LXByZXYtbm8tZHVwbGljYXRlLmpzIGIv TGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9yZXNvdXJjZXMvaW5kZXgtcHJl di1uby1kdXBsaWNhdGUuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOTYw ZDAwMTRjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIv bW96aWxsYS9yZXNvdXJjZXMvaW5kZXgtcHJldi1uby1kdXBsaWNhdGUuanMKQEAgLTAsMCArMSwx NDggQEAKKy8vICBvcmlnaW5hbCB0ZXN0OiBodHRwOi8vbXhyLm1vemlsbGEub3JnL21vemlsbGEy LjAvc291cmNlL2RvbS9pbmRleGVkREIvdGVzdC90ZXN0X2luZGV4ZXMuaHRtbD9mb3JjZT0xCisv LyAgbGljZW5zZSBvZiBvcmlnaW5hbCB0ZXN0OgorLy8gICAgIiBBbnkgY29weXJpZ2h0IGlzIGRl ZGljYXRlZCB0byB0aGUgUHVibGljIERvbWFpbi4KKy8vICAgICAgaHR0cDovL2NyZWF0aXZlY29t bW9ucy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wLyAiCisKK2lmICh0aGlzLmltcG9ydFNjcmlw dHMpIHsKKyAgICBpbXBvcnRTY3JpcHRzKCcuLi8uLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC5q cycpOworICAgIGltcG9ydFNjcmlwdHMoJy4uLy4uL3Jlc291cmNlcy9zaGFyZWQuanMnKTsKK30K KworZGVzY3JpcHRpb24oIlRlc3QgSW5kZXhlZERCOiBpdGVyYXRpbmcgYmFja3dhcmRzIHRocm91 Z2ggYW4gaW5kZXgsIHNraXBwaW5nIGR1cGxpY2F0ZXMiKTsKKworaW5kZXhlZERCVGVzdChwcmVw YXJlRGF0YWJhc2UsIHRlc3RQcmV2KTsKK2Z1bmN0aW9uIHByZXBhcmVEYXRhYmFzZSgpCit7Cisg ICAgZGIgPSBldmVudC50YXJnZXQucmVzdWx0OworICAgIHRyYW5zID0gZXZlbnQudGFyZ2V0LnRy YW5zYWN0aW9uOworCisgICAgb2JqZWN0U3RvcmVOYW1lID0gIlBlb3BsZSI7CisKKyAgICBvYmpl Y3RTdG9yZURhdGEgPSBbCisgICAgICAgIHsga2V5OiAiMjM3LTIzLTc3MzIiLCB2YWx1ZTogeyBu YW1lOiAiQm9iIiwgaGVpZ2h0OiA2MCwgd2VpZ2h0OiAxMjAgfSB9LAorICAgICAgICB7IGtleTog IjIzNy0yMy03NzMzIiwgdmFsdWU6IHsgbmFtZTogIkFubiIsIGhlaWdodDogNTIsIHdlaWdodDog MTEwIH0gfSwKKyAgICAgICAgeyBrZXk6ICIyMzctMjMtNzczNCIsIHZhbHVlOiB7IG5hbWU6ICJS b24iLCBoZWlnaHQ6IDczLCB3ZWlnaHQ6IDE4MCB9IH0sCisgICAgICAgIHsga2V5OiAiMjM3LTIz LTc3MzUiLCB2YWx1ZTogeyBuYW1lOiAiU3VlIiwgaGVpZ2h0OiA1OCwgd2VpZ2h0OiAxMzAgfSB9 LAorICAgICAgICB7IGtleTogIjIzNy0yMy03NzM2IiwgdmFsdWU6IHsgbmFtZTogIkpvZSIsIGhl aWdodDogNjUsIHdlaWdodDogMTUwIH0gfSwKKyAgICAgICAgeyBrZXk6ICIyMzctMjMtNzczNyIs IHZhbHVlOiB7IG5hbWU6ICJQYXQiLCBoZWlnaHQ6IDY1LCB3ZWlnaHQ6IDEwMCB9IH0sCisgICAg ICAgIHsga2V5OiAiMjM3LTIzLTc3MzgiLCB2YWx1ZTogeyBuYW1lOiAiTGVvIiwgaGVpZ2h0OiA2 NSwgd2VpZ2h0OiAxODAgfSB9LAorICAgICAgICB7IGtleTogIjIzNy0yMy03NzM5IiwgdmFsdWU6 IHsgbmFtZTogIkplZiIsIGhlaWdodDogNjUsIHdlaWdodDogMTIwIH0gfSwKKyAgICAgICAgeyBr ZXk6ICIyMzctMjMtNzc0MCIsIHZhbHVlOiB7IG5hbWU6ICJTYW0iLCBoZWlnaHQ6IDczLCB3ZWln aHQ6IDExMCB9IH0sCisgICAgXTsKKworICAgIGluZGV4RGF0YSA9IFsKKyAgICAgICAgeyBuYW1l OiAibmFtZSIsIGtleVBhdGg6ICJuYW1lIiwgb3B0aW9uczogeyB1bmlxdWU6IHRydWUgfSB9LAor ICAgICAgICB7IG5hbWU6ICJoZWlnaHQiLCBrZXlQYXRoOiAiaGVpZ2h0Iiwgb3B0aW9uczogeyB9 IH0sCisgICAgICAgIHsgbmFtZTogIndlaWdodCIsIGtleVBhdGg6ICJ3ZWlnaHQiLCBvcHRpb25z OiB7IHVuaXF1ZTogZmFsc2UgfSB9CisgICAgXTsKKworICAgIG9iamVjdFN0b3JlRGF0YUhlaWdo dFNvcnQgPSBbCisgICAgICAgIHsga2V5OiAiMjM3LTIzLTc3MzMiLCB2YWx1ZTogeyBuYW1lOiAi QW5uIiwgaGVpZ2h0OiA1Miwgd2VpZ2h0OiAxMTAgfSB9LAorICAgICAgICB7IGtleTogIjIzNy0y My03NzM1IiwgdmFsdWU6IHsgbmFtZTogIlN1ZSIsIGhlaWdodDogNTgsIHdlaWdodDogMTMwIH0g fSwKKyAgICAgICAgeyBrZXk6ICIyMzctMjMtNzczMiIsIHZhbHVlOiB7IG5hbWU6ICJCb2IiLCBo ZWlnaHQ6IDYwLCB3ZWlnaHQ6IDEyMCB9IH0sCisgICAgICAgIHsga2V5OiAiMjM3LTIzLTc3MzYi LCB2YWx1ZTogeyBuYW1lOiAiSm9lIiwgaGVpZ2h0OiA2NSwgd2VpZ2h0OiAxNTAgfSB9LAorICAg ICAgICB7IGtleTogIjIzNy0yMy03NzM3IiwgdmFsdWU6IHsgbmFtZTogIlBhdCIsIGhlaWdodDog NjUsIHdlaWdodDogMTAwIH0gfSwKKyAgICAgICAgeyBrZXk6ICIyMzctMjMtNzczOCIsIHZhbHVl OiB7IG5hbWU6ICJMZW8iLCBoZWlnaHQ6IDY1LCB3ZWlnaHQ6IDE4MCB9IH0sCisgICAgICAgIHsg a2V5OiAiMjM3LTIzLTc3MzkiLCB2YWx1ZTogeyBuYW1lOiAiSmVmIiwgaGVpZ2h0OiA2NSwgd2Vp Z2h0OiAxMjAgfSB9LAorICAgICAgICB7IGtleTogIjIzNy0yMy03NzM0IiwgdmFsdWU6IHsgbmFt ZTogIlJvbiIsIGhlaWdodDogNzMsIHdlaWdodDogMTgwIH0gfSwKKyAgICAgICAgeyBrZXk6ICIy MzctMjMtNzc0MCIsIHZhbHVlOiB7IG5hbWU6ICJTYW0iLCBoZWlnaHQ6IDczLCB3ZWlnaHQ6IDEx MCB9IH0sCisgICAgXTsKKworICAgIG9iamVjdFN0b3JlID0gZXZhbEFuZExvZygib2JqZWN0U3Rv cmUgPSBkYi5jcmVhdGVPYmplY3RTdG9yZShvYmplY3RTdG9yZU5hbWUpOyIpOworICAgIGRlYnVn KCJGaXJzdCwgYWRkIGFsbCBvdXIgZGF0YSB0byB0aGUgb2JqZWN0IHN0b3JlLiIpOworICAgIGFk ZGVkRGF0YSA9IDA7CisgICAgZm9yIChpIGluIG9iamVjdFN0b3JlRGF0YSkgeworICAgICAgcmVx dWVzdCA9IGV2YWxBbmRMb2coInJlcXVlc3QgPSBvYmplY3RTdG9yZS5hZGQob2JqZWN0U3RvcmVE YXRhW2ldLnZhbHVlLCBvYmplY3RTdG9yZURhdGFbaV0ua2V5KTsiKTsKKyAgICAgIHJlcXVlc3Qu b25lcnJvciA9IHVuZXhwZWN0ZWRFcnJvckNhbGxiYWNrOworICAgICAgcmVxdWVzdC5vbnN1Y2Nl c3MgPSBmdW5jdGlvbihldmVudCkKKyAgICAgIHsKKyAgICAgICAgaWYgKCsrYWRkZWREYXRhID09 IG9iamVjdFN0b3JlRGF0YS5sZW5ndGgpIHsKKyAgICAgICAgICBjcmVhdGVJbmRleGVzKCk7Cisg ICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisgICAgdHJhbnMub25jb21wbGV0ZSA9IGZ1bmN0aW9u KCkgeworICAgICAgICBldmFsQW5kTG9nKCJ0cmFucyA9IGRiLnRyYW5zYWN0aW9uKG9iamVjdFN0 b3JlTmFtZSwgJ3JlYWR3cml0ZScpIik7CisgICAgICAgIGV2YWxBbmRMb2coIm9iamVjdFN0b3Jl ID0gdHJhbnMub2JqZWN0U3RvcmUob2JqZWN0U3RvcmVOYW1lKSIpOworICAgIH07Cit9CisKK2Z1 bmN0aW9uIGNyZWF0ZUluZGV4ZXMoKQoreworICAgIGRlYnVnKCJOb3cgY3JlYXRlIHRoZSBpbmRl eGVzLiIpOworICAgIGZvciAoaSBpbiBpbmRleERhdGEpIHsKKyAgICAgIGV2YWxBbmRMb2coIm9i amVjdFN0b3JlLmNyZWF0ZUluZGV4KGluZGV4RGF0YVtpXS5uYW1lLCBpbmRleERhdGFbaV0ua2V5 UGF0aCwgaW5kZXhEYXRhW2ldLm9wdGlvbnMpOyIpOworICAgIH0KK30KKworZnVuY3Rpb24gdGVz dFByZXYoKQoreworICAgIGRlYnVnKCJ0ZXN0UHJldigpIik7CisgICAgdHJhbnMgPSBldmFsQW5k TG9nKCJ0cmFucyA9IGRiLnRyYW5zYWN0aW9uKG9iamVjdFN0b3JlTmFtZSkiKTsKKyAgICBvYmpl Y3RTdG9yZSA9IGV2YWxBbmRMb2coIm9iamVjdFN0b3JlID0gdHJhbnMub2JqZWN0U3RvcmUob2Jq ZWN0U3RvcmVOYW1lKTsiKTsKKyAgICBrZXlJbmRleCA9IGV2YWxBbmRMb2coImtleUluZGV4ID0g ODsiKTsKKyAgICAvLyBmaXJzdCB0cnkgd2l0aCBqdXN0IFBSRVYKKyAgICByZXF1ZXN0ID0gZXZh bEFuZExvZygicmVxdWVzdCA9IG9iamVjdFN0b3JlLmluZGV4KCdoZWlnaHQnKS5vcGVuQ3Vyc29y KG51bGwsICdwcmV2Jyk7Iik7CisgICAgcmVxdWVzdC5vbmVycm9yID0gdW5leHBlY3RlZEVycm9y Q2FsbGJhY2s7CisgICAgcmVxdWVzdC5vbnN1Y2Nlc3MgPSBmdW5jdGlvbihldmVudCkKKyAgICB7 CisgICAgICAgIGN1cnNvciA9IGV2YWxBbmRMb2coImN1cnNvciA9IGV2ZW50LnRhcmdldC5yZXN1 bHQ7Iik7CisgICAgICAgIGlmIChjdXJzb3IpIHsKKyAgICAgICAgICAgIHNob3VsZEJlKCJjdXJz b3Iua2V5IiwgIiIgKyBvYmplY3RTdG9yZURhdGFIZWlnaHRTb3J0W2tleUluZGV4XS52YWx1ZS5o ZWlnaHQpOworICAgICAgICAgICAgc2hvdWxkQmUoImN1cnNvci5wcmltYXJ5S2V5IiwgIiciICsg b2JqZWN0U3RvcmVEYXRhSGVpZ2h0U29ydFtrZXlJbmRleF0ua2V5ICsgIiciKTsKKyAgICAgICAg ICAgIHNob3VsZEJlKCJjdXJzb3IudmFsdWUubmFtZSIsICInIiArIG9iamVjdFN0b3JlRGF0YUhl aWdodFNvcnRba2V5SW5kZXhdLnZhbHVlLm5hbWUgKyAiJyIpOworICAgICAgICAgICAgc2hvdWxk QmUoImN1cnNvci52YWx1ZS5oZWlnaHQiLCAiIiArIG9iamVjdFN0b3JlRGF0YUhlaWdodFNvcnRb a2V5SW5kZXhdLnZhbHVlLmhlaWdodCk7CisgICAgICAgICAgICBpZiAoJ3dlaWdodCcgaW4gY3Vy c29yLnZhbHVlKSB7CisgICAgICAgICAgICAgICAgc2hvdWxkQmUoImN1cnNvci52YWx1ZS53ZWln aHQiLCAiIiArIG9iamVjdFN0b3JlRGF0YUhlaWdodFNvcnRba2V5SW5kZXhdLnZhbHVlLndlaWdo dCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGV2YWxBbmRMb2coImN1cnNvci5jb250 aW51ZSgpOyIpOworICAgICAgICAgICAgZXZhbEFuZExvZygia2V5SW5kZXgtLTsiKTsKKyAgICAg ICAgICAgIGRlYnVnKCIgID0+ICIgKyBrZXlJbmRleCk7CisgICAgICAgIH0KKyAgICAgICAgZWxz ZSB7CisgICAgICAgICAgICBkZWJ1ZygiTm8gY3Vyc29yOiAiICsgY3Vyc29yKTsKKyAgICAgICAg ICAgIHNob3VsZEJlKCJrZXlJbmRleCIsICItMSIpOworICAgICAgICB9CisgICAgfTsKKyAgICB0 cmFucy5vbmNvbXBsZXRlID0gdGVzdFByZXZOb0R1cGxpY2F0ZTsKK30KKworZnVuY3Rpb24gdGVz dFByZXZOb0R1cGxpY2F0ZSgpCit7CisgICAgZGVidWcoInRlc3RQcmV2Tm9EdXBsaWNhdGUoKSIp OworICAgIG9iamVjdFN0b3JlID0gZXZhbEFuZExvZygib2JqZWN0U3RvcmUgPSBkYi50cmFuc2Fj dGlvbihvYmplY3RTdG9yZU5hbWUpLm9iamVjdFN0b3JlKG9iamVjdFN0b3JlTmFtZSk7Iik7Cisg ICAga2V5SW5kZXggPSBldmFsQW5kTG9nKCJrZXlJbmRleCA9IDg7Iik7CisgICAgcmVxdWVzdCA9 IGV2YWxBbmRMb2coInJlcXVlc3QgPSBvYmplY3RTdG9yZS5pbmRleCgnaGVpZ2h0Jykub3BlbkN1 cnNvcihudWxsLCAncHJldnVuaXF1ZScpOyIpOworICAgIHJlcXVlc3Qub25lcnJvciA9IHVuZXhw ZWN0ZWRFcnJvckNhbGxiYWNrOworICAgIHJlcXVlc3Qub25zdWNjZXNzID0gZnVuY3Rpb24gKGV2 ZW50KQorICAgIHsKKyAgICAgICAgY3Vyc29yID0gZXZhbEFuZExvZygiY3Vyc29yID0gZXZlbnQu dGFyZ2V0LnJlc3VsdDsiKTsKKyAgICAgICAgICAgIGlmIChrZXlJbmRleCA9PSA4KSB7CisgICAg ICAgICAgICAgICAgZXZhbEFuZExvZygia2V5SW5kZXggLT0gMSIpOworICAgICAgICAgICAgfQor ICAgICAgICAgICAgaWYgKGtleUluZGV4ID09IDYpIHsKKyAgICAgICAgICAgICAgICBldmFsQW5k TG9nKCJrZXlJbmRleCAtPSAzOyIpOworICAgICAgICAgICAgfQorICAgICAgICBkZWJ1ZygiICA9 PiBFbnRlcmluZyB3aXRoIGtleUluZGV4ID0gIiArIGtleUluZGV4KTsKKyAgICAgICAgaWYgKGN1 cnNvcikgeworICAgICAgICAgICAgc2hvdWxkQmUoImN1cnNvci5rZXkiLCAiIiArIG9iamVjdFN0 b3JlRGF0YUhlaWdodFNvcnRba2V5SW5kZXhdLnZhbHVlLmhlaWdodCk7CisgICAgICAgICAgICBz aG91bGRCZSgiY3Vyc29yLnByaW1hcnlLZXkiLCAiJyIgKyBvYmplY3RTdG9yZURhdGFIZWlnaHRT b3J0W2tleUluZGV4XS5rZXkgKyAiJyIpOworICAgICAgICAgICAgc2hvdWxkQmUoImN1cnNvci52 YWx1ZS5uYW1lIiwgIiciICsgb2JqZWN0U3RvcmVEYXRhSGVpZ2h0U29ydFtrZXlJbmRleF0udmFs dWUubmFtZSArICInIik7CisgICAgICAgICAgICBzaG91bGRCZSgiY3Vyc29yLnZhbHVlLmhlaWdo dCIsICIiICsgb2JqZWN0U3RvcmVEYXRhSGVpZ2h0U29ydFtrZXlJbmRleF0udmFsdWUuaGVpZ2h0 KTsKKyAgICAgICAgICAgIGlmICgnd2VpZ2h0JyBpbiBjdXJzb3IudmFsdWUpIHsKKyAgICAgICAg ICAgICAgICBzaG91bGRCZSgiY3Vyc29yLnZhbHVlLndlaWdodCIsICIiICsgb2JqZWN0U3RvcmVE YXRhSGVpZ2h0U29ydFtrZXlJbmRleF0udmFsdWUud2VpZ2h0KTsKKyAgICAgICAgICAgIH0KKwor ICAgICAgICAgICAgZXZhbEFuZExvZygiY3Vyc29yLmNvbnRpbnVlKCk7Iik7CisgICAgICAgICAg ICBldmFsQW5kTG9nKCJrZXlJbmRleC0tOyIpOworICAgICAgICB9CisgICAgICAgIGVsc2Ugewor ICAgICAgICAgICAgZGVidWcoIk5vIGN1cnNvcjogIiArIGN1cnNvcik7CisgICAgICAgICAgICBz aG91bGRCZSgia2V5SW5kZXgiLCAiLTEiKTsKKyAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOwor ICAgICAgICB9CisgICAgfQorfQorCit2YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsK