49812 2010-11-19 10:40:29 -0800 [NRWT] Simplify Driver.run_test() so that it takes only one parameter, TestInput. 2010-11-22 13:01:08 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hayato webkit-unassigned dpranke hamaji tony oldest_to_newest 311560 0 hayato 2010-11-19 10:40:29 -0800 Currently, each driver's run_test() method receives filename, timeout and checksum as parameters. It might be better that run_test() only receives one parameter, TestInput. 311563 1 74403 hayato 2010-11-19 10:48:32 -0800 Created attachment 74403 simplify-run-test 311565 2 hayato 2010-11-19 10:54:50 -0800 In this refactoring, I assume: self._port.uri_to_test_name(self._port.filname_to_uri(filename)) == self._port.relative_test_filename(filename) It seems this relation is always true. If my assumption is wrong, plese let me know. 311693 3 74403 dpranke 2010-11-19 14:21:31 -0800 Comment on attachment 74403 simplify-run-test View in context: https://bugs.webkit.org/attachment.cgi?id=74403&action=review Patch looks good to me . There are a couple of minor nits below. > WebKitTools/Scripts/webkitpy/layout_tests/driver_test.py:45 > image_path = 'image_result.png' Please just delete this file; even I don't really have a use for it any more. Originally I intended it to be a way for people to test their port Driver implementations w/o needing the rest of the NRWT scaffolding, but I don't think it's that useful at this point. > WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:106 > + # checksums match. The image_hash is set lazily to reduce startup time. Please change the second sentence to something like "The image hash is set later, and only if it is needed for the test". I want to remove the "lazy" part of this. 311700 4 74403 hamaji 2010-11-19 14:41:33 -0800 Comment on attachment 74403 simplify-run-test r+ assuming you'll address Dirk's comments 311734 5 hayato 2010-11-19 15:43:23 -0800 Thank you for the review, Dirk. I'll address your comments and will land the updated patch later. Thank you. (In reply to comment #3) > (From update of attachment 74403 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=74403&action=review > > Patch looks good to me . There are a couple of minor nits below. > > > WebKitTools/Scripts/webkitpy/layout_tests/driver_test.py:45 > > image_path = 'image_result.png' > > Please just delete this file; even I don't really have a use for it any more. Originally I intended it to be a way for people to test their port Driver implementations w/o needing the rest of the NRWT scaffolding, but I don't think it's that useful at this point. > > > WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:106 > > + # checksums match. The image_hash is set lazily to reduce startup time. > > Please change the second sentence to something like "The image hash is set later, and only if it is needed for the test". I want to remove the "lazy" part of this. 312475 6 hayato 2010-11-22 13:01:08 -0800 Committed r72551: <http://trac.webkit.org/changeset/72551> 74403 2010-11-19 10:48:32 -0800 2010-11-19 14:41:33 -0800 simplify-run-test bug-49812-20101120034830.patch text/plain 11798 hayato ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4NDJlY2M3NWNhOTk4MzU4MGM2MDQ0ZmJjMTZjNjYxMmExODczYjhlLi5hOTIxZTIx ZWMyZjJlYzIzN2I3MjczNTY0OGEyZmVmMDVhODIzYWZhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAK KzIwMTAtMTEtMTkgIEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNpbXBsaWZ5IERyaXZlci5y dW5fdGVzdCgpIHNvIHRoYXQgaXQgdGFrZXMgb25seSBvbmUgcGFyYW1ldGVyLCBUZXN0SW5wdXQu CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5ODEy CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9kcml2ZXJfdGVzdC5w eToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2Fn ZS9kdW1wX3JlbmRlcl90cmVlX3RocmVhZC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9kcnlydW4ucHk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weToKKwog MjAxMC0xMS0xOCAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKICAgICAgICAgQWRk IHRocmVlIG5ldyBXaW5kb3dzIFhQIGJ1aWxkIHNsYXZlcwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvZHJpdmVyX3Rlc3QucHkgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9kcml2ZXJfdGVzdC5weQppbmRleCA2 MzNkZmU4NDZiNGFkNmQxMjA5Y2M2MzljZDk2NzcxYTkzNGU3ZGYwLi5mNmU2NGM1YTM4MWEwNGM5 NmRmMTAzN2I3MDQ5Y2MxZmZmZjhmYzNmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9kcml2ZXJfdGVzdC5weQorKysgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9kcml2ZXJfdGVzdC5weQpAQCAtMzksNiArMzks NyBAQCBpbXBvcnQgb3B0cGFyc2UKIGltcG9ydCBwb3J0CiAKIAorIyBUaGlzIGZ1bmN0aW9uIGlz IG5vdCBtYWludGFpbmVkLgogZGVmIHJ1bl90ZXN0cyhwb3J0LCBvcHRpb25zLCB0ZXN0cyk6CiAg ICAgIyB8aW1hZ2VfcGF0aHwgaXMgYSBwYXRoIHRvIHRoZSBpbWFnZSBjYXB0dXJlIGZyb20gdGhl IGRyaXZlci4KICAgICBpbWFnZV9wYXRoID0gJ2ltYWdlX3Jlc3VsdC5wbmcnCmRpZmYgLS1naXQg YS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2Fn ZS9kdW1wX3JlbmRlcl90cmVlX3RocmVhZC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1bXBfcmVuZGVyX3RyZWVfdGhyZWFkLnB5 CmluZGV4IDg4ZjQ5M2QwZjk4YWRiMzQxMTUzOWRmOTIwOTA0MmU0NGI1NTM5M2MuLjJjODFlYmNm NzM5MTYxOTRiYjU0YzlhMTE3MTQxODIwMTJjOTQ5ZmQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1bXBfcmVuZGVy X3RyZWVfdGhyZWFkLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1bXBfcmVuZGVyX3RyZWVfdGhyZWFkLnB5CkBAIC0xNjks MTEgKzE2OSw4IEBAIGRlZiBfcnVuX3NpbmdsZV90ZXN0KHBvcnQsIG9wdGlvbnMsIHRlc3RfaW5w dXQsIHRlc3RfdHlwZXMsIHRlc3RfYXJncywgZHJpdmVyKToKICAgICAjIGFyZSBnZW5lcmF0aW5n IGEgbmV3IGJhc2VsaW5lLiAgKE90aGVyd2lzZSwgYW4gaW1hZ2UgZnJvbSBhCiAgICAgIyBwcmV2 aW91cyBydW4gd2lsbCBiZSBjb3BpZWQgaW50byB0aGUgYmFzZWxpbmUuIiIiCiAgICAgaWYgX3No b3VsZF9mZXRjaF9leHBlY3RlZF9jaGVja3N1bShvcHRpb25zKToKLSAgICAgICAgaW1hZ2VfaGFz aF90b19kcml2ZXIgPSBwb3J0LmV4cGVjdGVkX2NoZWNrc3VtKHRlc3RfaW5wdXQuZmlsZW5hbWUp Ci0gICAgZWxzZToKLSAgICAgICAgaW1hZ2VfaGFzaF90b19kcml2ZXIgPSBOb25lCi0gICAgdXJp ID0gcG9ydC5maWxlbmFtZV90b191cmkodGVzdF9pbnB1dC5maWxlbmFtZSkKLSAgICB0ZXN0X291 dHB1dCA9IGRyaXZlci5ydW5fdGVzdCh1cmksIHRlc3RfaW5wdXQudGltZW91dCwgaW1hZ2VfaGFz aF90b19kcml2ZXIpCisgICAgICAgIHRlc3RfaW5wdXQuaW1hZ2VfaGFzaCA9IHBvcnQuZXhwZWN0 ZWRfY2hlY2tzdW0odGVzdF9pbnB1dC5maWxlbmFtZSkKKyAgICB0ZXN0X291dHB1dCA9IGRyaXZl ci5ydW5fdGVzdCh0ZXN0X2lucHV0KQogICAgIHJldHVybiBfcHJvY2Vzc19vdXRwdXQocG9ydCwg b3B0aW9ucywgdGVzdF9pbnB1dCwgdGVzdF90eXBlcywgdGVzdF9hcmdzLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgdGVzdF9vdXRwdXQpCiAKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weSBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQppbmRleCA2MzI4MDZmYjJj ZTMwZjUzODkzZDQ4ZTc4NTBiYzBmYjg4NzRjMzkwLi4zZmIwZDhlYzc2NzdmYzUzYmRhYWQxY2Yz MTRlMzc2YTgyYmVmNGYyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC04MjAsMTcgKzgyMCwxNSBAQCBjbGFz cyBEcml2ZXI6CiAgICAgICAgICIiIgogICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9y KCdEcml2ZXIuX19pbml0X18nKQogCi0gICAgZGVmIHJ1bl90ZXN0KHNlbGYsIHVyaSwgdGltZW91 dCwgY2hlY2tzdW0pOgorICAgIGRlZiBydW5fdGVzdChzZWxmLCB0ZXN0X2lucHV0KToKICAgICAg ICAgIiIiUnVuIGEgc2luZ2xlIHRlc3QgYW5kIHJldHVybiB0aGUgcmVzdWx0cy4KIAogICAgICAg ICBOb3RlIHRoYXQgaXQgaXMgb2theSBpZiBhIHRlc3QgdGltZXMgb3V0IG9yIGNyYXNoZXMgYW5k IGxlYXZlcwogICAgICAgICB0aGUgZHJpdmVyIGluIGFuIGluZGV0ZXJtaW5hdGUgc3RhdGUuIFRo ZSB1cHBlciBsYXllcnMgb2YgdGhlIHByb2dyYW0KICAgICAgICAgYXJlIHJlc3BvbnNpYmxlIGZv ciBjbGVhbmluZyB1cCBhbmQgZW5zdXJpbmcgdGhpbmdzIGFyZSBva2F5LgogCi0gICAgICAgIHVy aSAtIGEgZnVsbCBVUkkgZm9yIHRoZSBnaXZlbiB0ZXN0Ci0gICAgICAgIHRpbWVvdXQgLSBudW1i ZXIgb2YgbWlsbGlzZWNvbmRzIHRvIHdhaXQgYmVmb3JlIGFib3J0aW5nIHRoaXMgdGVzdC4KLSAg ICAgICAgY2hlY2tzdW0gLSBpZiBwcmVzZW50LCB0aGUgZXhwZWN0ZWQgY2hlY2tzdW0gZm9yIHRo ZSBpbWFnZSBmb3IgdGhpcwotICAgICAgICAgICAgdGVzdAorICAgICAgICBBcmdzOgorICAgICAg ICAgIHRlc3RfaW5wdXQ6IGEgVGVzdElucHV0IG9iamVjdAogCiAgICAgICAgIFJldHVybnMgYSBU ZXN0T3V0cHV0IG9iamVjdC4KICAgICAgICAgIiIiCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2VfdW5pdHRlc3QucHkgYi9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2VfdW5pdHRlc3Qu cHkKaW5kZXggMWU5YzJiNzVlMDI0OTA5OWIxOGYxNDgyOTczNDAxZWI2OGYwOTk5MS4uMjI3MDll YWJkZjgyZmI4ODQ5NTRmZGI5YWQ1ZjYzZjk3YThjNmQwMCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5Cisr KyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZV91 bml0dGVzdC5weQpAQCAtMjkwLDcgKzI5MCw3IEBAIGNsYXNzIFZpcnR1YWxUZXN0KHVuaXR0ZXN0 LlRlc3RDYXNlKToKICAgICAgICAgICAgICAgICBwYXNzCiAKICAgICAgICAgZHJpdmVyID0gVmly dHVhbERyaXZlcigpCi0gICAgICAgIHNlbGYuYXNzZXJ0VmlydHVhbChkcml2ZXIucnVuX3Rlc3Qs IE5vbmUsIE5vbmUsIE5vbmUpCisgICAgICAgIHNlbGYuYXNzZXJ0VmlydHVhbChkcml2ZXIucnVu X3Rlc3QsIE5vbmUpCiAgICAgICAgIHNlbGYuYXNzZXJ0VmlydHVhbChkcml2ZXIucG9sbCkKICAg ICAgICAgc2VsZi5hc3NlcnRWaXJ0dWFsKGRyaXZlci5zdG9wKQogCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5IGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5w eQppbmRleCAzMTQ5MjkwOTlhYzEzNmQyODYxMmUzY2NmNzgxNzIxOTBkZjhmZDMyLi40ZmY3MWU5 MzViM2RhZDJhYjc0ZDRiZmVkZGUxMjM0NTllY2FkODQ3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkK QEAgLTQ1NCw3ICs0NTQsNyBAQCBjbGFzcyBDaHJvbWl1bURyaXZlcihiYXNlLkRyaXZlcik6CiAg ICAgICAgIGVsc2U6CiAgICAgICAgICAgICByZXR1cm4gTm9uZQogCi0gICAgZGVmIHJ1bl90ZXN0 KHNlbGYsIHVyaSwgdGltZW91dG1zLCBjaGVja3N1bSk6CisgICAgZGVmIHJ1bl90ZXN0KHNlbGYs IHRlc3RfaW5wdXQpOgogICAgICAgICBvdXRwdXQgPSBbXQogICAgICAgICBlcnJvciA9IFtdCiAg ICAgICAgIGNyYXNoID0gRmFsc2UKQEAgLTQ2NCw3ICs0NjQsOSBAQCBjbGFzcyBDaHJvbWl1bURy aXZlcihiYXNlLkRyaXZlcik6CiAKICAgICAgICAgc3RhcnRfdGltZSA9IHRpbWUudGltZSgpCiAK LSAgICAgICAgY21kID0gc2VsZi5fdGVzdF9zaGVsbF9jb21tYW5kKHVyaSwgdGltZW91dG1zLCBj aGVja3N1bSkKKyAgICAgICAgdXJpID0gc2VsZi5fcG9ydC5maWxlbmFtZV90b191cmkodGVzdF9p bnB1dC5maWxlbmFtZSkKKyAgICAgICAgY21kID0gc2VsZi5fdGVzdF9zaGVsbF9jb21tYW5kKHVy aSwgdGVzdF9pbnB1dC50aW1lb3V0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdGVzdF9pbnB1dC5pbWFnZV9oYXNoKQogICAgICAgICAobGluZSwgY3Jhc2gpID0gc2Vs Zi5fd3JpdGVfY29tbWFuZF9hbmRfcmVhZF9saW5lKGlucHV0PWNtZCkKIAogICAgICAgICB3aGls ZSBub3QgY3Jhc2ggYW5kIGxpbmUucnN0cmlwKCkgIT0gIiNFT0YiOgpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9kcnlydW4ucHkgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyeXJ1bi5weQpp bmRleCA5NmQwZDU1ZjYyZDdiYzE0YjRhZDQzYTllYWE5ZWQwNjlkNjQyMDE2Li5kNDQ0ZGFiMTIz MTQyZGRlMTNkZTBhNzExZjYzMzE5ZGQ2MTY1MDMyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyeXJ1bi5weQorKysgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyeXJ1bi5weQpAQCAtMTEx LDE1ICsxMTEsMTMgQEAgY2xhc3MgRHJ5cnVuRHJpdmVyKGJhc2UuRHJpdmVyKToKICAgICBkZWYg cG9sbChzZWxmKToKICAgICAgICAgcmV0dXJuIE5vbmUKIAotICAgIGRlZiBydW5fdGVzdChzZWxm LCB1cmksIHRpbWVvdXRtcywgaW1hZ2VfaGFzaCk6CisgICAgZGVmIHJ1bl90ZXN0KHNlbGYsIHRl c3RfaW5wdXQpOgogICAgICAgICBzdGFydF90aW1lID0gdGltZS50aW1lKCkKLSAgICAgICAgdGVz dF9uYW1lID0gc2VsZi5fcG9ydC51cmlfdG9fdGVzdF9uYW1lKHVyaSkKLSAgICAgICAgcGF0aCA9 IG9zLnBhdGguam9pbihzZWxmLl9wb3J0LmxheW91dF90ZXN0c19kaXIoKSwgdGVzdF9uYW1lKQot ICAgICAgICB0ZXh0X291dHB1dCA9IHNlbGYuX3BvcnQuZXhwZWN0ZWRfdGV4dChwYXRoKQorICAg ICAgICB0ZXh0X291dHB1dCA9IHNlbGYuX3BvcnQuZXhwZWN0ZWRfdGV4dCh0ZXN0X2lucHV0LmZp bGVuYW1lKQogCi0gICAgICAgIGlmIGltYWdlX2hhc2ggaXMgbm90IE5vbmU6Ci0gICAgICAgICAg ICBpbWFnZSA9IHNlbGYuX3BvcnQuZXhwZWN0ZWRfaW1hZ2UocGF0aCkKLSAgICAgICAgICAgIGhh c2ggPSBzZWxmLl9wb3J0LmV4cGVjdGVkX2NoZWNrc3VtKHBhdGgpCisgICAgICAgIGlmIHRlc3Rf aW5wdXQuaW1hZ2VfaGFzaCBpcyBub3QgTm9uZToKKyAgICAgICAgICAgIGltYWdlID0gc2VsZi5f cG9ydC5leHBlY3RlZF9pbWFnZSh0ZXN0X2lucHV0LmZpbGVuYW1lKQorICAgICAgICAgICAgaGFz aCA9IHNlbGYuX3BvcnQuZXhwZWN0ZWRfY2hlY2tzdW0odGVzdF9pbnB1dC5maWxlbmFtZSkKICAg ICAgICAgZWxzZToKICAgICAgICAgICAgIGltYWdlID0gTm9uZQogICAgICAgICAgICAgaGFzaCA9 IE5vbmUKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvdGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvdGVzdC5weQppbmRleCAwYTI3ODIxNGRjMWIyNTlhOTc0OGQyZGJiMzU2NWQ1MGZh MjUxNWI0Li5kZDhmNjE4YThlYTllY2RkMmY2MTUxNGFlMGMwM2ExNmMxYTY2YzUyIDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3Qu cHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90 ZXN0LnB5CkBAIC0yOTAsMTYgKzI5MCwxNiBAQCBjbGFzcyBUZXN0RHJpdmVyKGJhc2UuRHJpdmVy KToKICAgICBkZWYgcG9sbChzZWxmKToKICAgICAgICAgcmV0dXJuIFRydWUKIAotICAgIGRlZiBy dW5fdGVzdChzZWxmLCB1cmksIHRpbWVvdXRtcywgaW1hZ2VfaGFzaCk6CisgICAgZGVmIHJ1bl90 ZXN0KHNlbGYsIHRlc3RfaW5wdXQpOgogICAgICAgICBzdGFydF90aW1lID0gdGltZS50aW1lKCkK LSAgICAgICAgdGVzdF9uYW1lID0gc2VsZi5fcG9ydC51cmlfdG9fdGVzdF9uYW1lKHVyaSkKKyAg ICAgICAgdGVzdF9uYW1lID0gc2VsZi5fcG9ydC5yZWxhdGl2ZV90ZXN0X2ZpbGVuYW1lKHRlc3Rf aW5wdXQuZmlsZW5hbWUpCiAgICAgICAgIHRlc3QgPSBzZWxmLl9wb3J0Ll90ZXN0c1t0ZXN0X25h bWVdCiAgICAgICAgIGlmIHRlc3Qua2V5Ym9hcmQ6CiAgICAgICAgICAgICByYWlzZSBLZXlib2Fy ZEludGVycnVwdAogICAgICAgICBpZiB0ZXN0LmV4Y2VwdGlvbjoKICAgICAgICAgICAgIHJhaXNl IFZhbHVlRXJyb3IoJ2V4Y2VwdGlvbiBmcm9tICcgKyB0ZXN0X25hbWUpCiAgICAgICAgIGlmIHRl c3QuaGFuZzoKLSAgICAgICAgICAgIHRpbWUuc2xlZXAoKGZsb2F0KHRpbWVvdXRtcykgKiA0KSAv IDEwMDAuMCkKKyAgICAgICAgICAgIHRpbWUuc2xlZXAoKGZsb2F0KHRlc3RfaW5wdXQudGltZW91 dCkgKiA0KSAvIDEwMDAuMCkKICAgICAgICAgcmV0dXJuIHRlc3Rfb3V0cHV0LlRlc3RPdXRwdXQo dGVzdC5hY3R1YWxfdGV4dCwgdGVzdC5hY3R1YWxfaW1hZ2UsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHRlc3QuYWN0dWFsX2NoZWNrc3VtLCB0ZXN0LmNyYXNoLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aW1lLnRpbWUoKSAtIHN0YXJ0X3Rp bWUsIHRlc3QudGltZW91dCwKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKaW5kZXggMDY3OTdjNmQzOGUyNTQ1NzBk M2ZmYTBlYjYxYTJiM2M2OTQzNjA4Ny4uZjVmOTI1MjY3MDMxY2VjYjM5NDA1NWY4MmQ1OTBjMDU0 YTkwODMzZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC93ZWJraXQucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKQEAgLTQzMywxNCArNDMzLDE1IEBAIGNsYXNzIFdl YktpdERyaXZlcihiYXNlLkRyaXZlcik6CiAgICAgICAgIHJldHVybgogCiAgICAgIyBGSVhNRTog VGhpcyBmdW5jdGlvbiBpcyBodWdlLgotICAgIGRlZiBydW5fdGVzdChzZWxmLCB1cmksIHRpbWVv dXRtcywgaW1hZ2VfaGFzaCk6CisgICAgZGVmIHJ1bl90ZXN0KHNlbGYsIHRlc3RfaW5wdXQpOgor ICAgICAgICB1cmkgPSBzZWxmLl9wb3J0LmZpbGVuYW1lX3RvX3VyaSh0ZXN0X2lucHV0LmZpbGVu YW1lKQogICAgICAgICBpZiB1cmkuc3RhcnRzd2l0aCgiZmlsZTovLy8iKToKICAgICAgICAgICAg IGNvbW1hbmQgPSB1cmlbNzpdCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBjb21tYW5kID0g dXJpCiAKLSAgICAgICAgaWYgaW1hZ2VfaGFzaDoKLSAgICAgICAgICAgIGNvbW1hbmQgKz0gIici ICsgaW1hZ2VfaGFzaAorICAgICAgICBpZiB0ZXN0X2lucHV0LmltYWdlX2hhc2g6CisgICAgICAg ICAgICBjb21tYW5kICs9ICInIiArIHRlc3RfaW5wdXQuaW1hZ2VfaGFzaAogICAgICAgICBjb21t YW5kICs9ICJcbiIKIAogICAgICAgICBzdGFydF90aW1lID0gdGltZS50aW1lKCkKQEAgLTQ1MSw3 ICs0NTIsNyBAQCBjbGFzcyBXZWJLaXREcml2ZXIoYmFzZS5Ecml2ZXIpOgogICAgICAgICBvdXRw dXQgPSBzdHIoKSAgIyBVc2UgYSBieXRlIGFycmF5IGZvciBvdXRwdXQsIGV2ZW4gdGhvdWdoIGl0 IHNob3VsZCBiZSBVVEYtOC4KICAgICAgICAgaW1hZ2UgPSBzdHIoKQogCi0gICAgICAgIHRpbWVv dXQgPSBpbnQodGltZW91dG1zKSAvIDEwMDAuMAorICAgICAgICB0aW1lb3V0ID0gaW50KHRlc3Rf aW5wdXQudGltZW91dCkgLyAxMDAwLjAKICAgICAgICAgZGVhZGxpbmUgPSB0aW1lLnRpbWUoKSAr IHRpbWVvdXQKICAgICAgICAgbGluZSA9IHNlbGYuX3NlcnZlcl9wcm9jZXNzLnJlYWRfbGluZSh0 aW1lb3V0KQogICAgICAgICB3aGlsZSAobm90IHNlbGYuX3NlcnZlcl9wcm9jZXNzLnRpbWVkX291 dApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cnVuX3dlYmtpdF90ZXN0cy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKaW5kZXggMTE5ZGU4Y2ZlZmU5OThlMTMwNWE4YzFj Nzk2OGE3MTYzY2JiNTU0Mi4uMDdjZmY4OWQyZGQ4ZDI1MTFjOWFmNTI1ODQ5OTY1M2UzMzQzOTIx MSAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cnVuX3dlYmtpdF90ZXN0cy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CkBAIC0xMDIsNiArMTAyLDkgQEAgY2xhc3Mg VGVzdElucHV0OgogICAgICAgICAjIEZJWE1FOiBmaWxlbmFtZSBzaG91bGQgcmVhbGx5IGJlIHRl c3RfbmFtZSBhcyBhIHJlbGF0aXZlIHBhdGguCiAgICAgICAgIHNlbGYuZmlsZW5hbWUgPSBmaWxl bmFtZQogICAgICAgICBzZWxmLnRpbWVvdXQgPSB0aW1lb3V0CisgICAgICAgICMgVGhlIGltYWdl IGhhc2ggaXMgdXNlZCB0byBhdm9pZCBkb2luZyBhbiBpbWFnZSBkdW1wIGlmIHRoZQorICAgICAg ICAjIGNoZWNrc3VtcyBtYXRjaC4gVGhlIGltYWdlX2hhc2ggaXMgc2V0IGxhemlseSB0byByZWR1 Y2Ugc3RhcnR1cCB0aW1lLgorICAgICAgICBzZWxmLmltYWdlX2hhc2ggPSBOb25lCiAKIAogY2xh c3MgUmVzdWx0U3VtbWFyeShvYmplY3QpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weSBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNf dW5pdHRlc3QucHkKaW5kZXggNTRlMWRjMDVkZjAxYzcwNjA3Y2UzMzZkNWQ5MDAwNDI2MTQ0NTU3 MC4uNmZlMDM5NzY5YTk2ZTFmYTM1MGQzOTRhNDVkNzVmMWY3OTI1OTVkZSAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0 c191bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5CkBAIC0xMzksMTIgKzEzOSwxMyBAQCBk ZWYgZ2V0X3Rlc3RzX3J1bihleHRyYV9hcmdzPU5vbmUsIHRlc3RzX2luY2x1ZGVkPUZhbHNlLCBm bGF0dGVuX2JhdGNoZXM9RmFsc2UpOgogICAgICAgICBkZWYgc3RvcChzZWxmKToKICAgICAgICAg ICAgIHNlbGYuX2N1cnJlbnRfdGVzdF9iYXRjaCA9IE5vbmUKIAotICAgICAgICBkZWYgcnVuX3Rl c3Qoc2VsZiwgdXJpLCB0aW1lb3V0bXMsIGltYWdlX2hhc2gpOgorICAgICAgICBkZWYgcnVuX3Rl c3Qoc2VsZiwgdGVzdF9pbnB1dCk6CiAgICAgICAgICAgICBpZiBzZWxmLl9jdXJyZW50X3Rlc3Rf YmF0Y2ggaXMgTm9uZToKICAgICAgICAgICAgICAgICBzZWxmLl9jdXJyZW50X3Rlc3RfYmF0Y2gg PSBbXQogICAgICAgICAgICAgICAgIHRlc3RfYmF0Y2hlcy5hcHBlbmQoc2VsZi5fY3VycmVudF90 ZXN0X2JhdGNoKQotICAgICAgICAgICAgc2VsZi5fY3VycmVudF90ZXN0X2JhdGNoLmFwcGVuZChz ZWxmLl9wb3J0LnVyaV90b190ZXN0X25hbWUodXJpKSkKLSAgICAgICAgICAgIHJldHVybiBUZXN0 RHJpdmVyLnJ1bl90ZXN0KHNlbGYsIHVyaSwgdGltZW91dG1zLCBpbWFnZV9oYXNoKQorICAgICAg ICAgICAgdGVzdF9uYW1lID0gc2VsZi5fcG9ydC5yZWxhdGl2ZV90ZXN0X2ZpbGVuYW1lKHRlc3Rf aW5wdXQuZmlsZW5hbWUpCisgICAgICAgICAgICBzZWxmLl9jdXJyZW50X3Rlc3RfYmF0Y2guYXBw ZW5kKHRlc3RfbmFtZSkKKyAgICAgICAgICAgIHJldHVybiBUZXN0RHJpdmVyLnJ1bl90ZXN0KHNl bGYsIHRlc3RfaW5wdXQpCiAKICAgICBjbGFzcyBSZWNvcmRpbmdUZXN0UG9ydChUZXN0UG9ydCk6 CiAgICAgICAgIGRlZiBjcmVhdGVfZHJpdmVyKHNlbGYsIGltYWdlX3BhdGgsIG9wdGlvbnMpOgo=