35055 2010-02-17 13:40:36 -0800 SingleTestThread and TestShellThread should share more code 2010-05-07 20:05:15 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED WONTFIX P2 Normal --- 34984 1 eric eric commit-queue dpranke levin oldest_to_newest 191185 0 eric 2010-02-17 13:40:36 -0800 SingleTestThread and TestShellThread should share more code 191186 1 48933 eric 2010-02-17 13:41:26 -0800 Created attachment 48933 Patch 191190 2 eric 2010-02-17 13:49:49 -0800 I did this because I was looking at adding support for dumping out the "list of prior test" for any test which fails. Many of our current failures are caused by test interactions. Knowing which tests were run leading up to a specific failure will help us narrow down those failures. 191192 3 48933 ojan 2010-02-17 13:53:52 -0800 Comment on attachment 48933 Patch > +# FIXME: Why do we need a separate class to handle --singly? Can't we just use many > +# TestShellThreads and only feed each one test? > +class SingleTestThread(TestThread): Actually, now that I look more closely at this, I'm not even sure we need that. What's weird right now is that SingleTestThread is spawned from TestShellThread. It's not clear to me why _run_test_singly doesn't just kill testshell/drt and then start it up again. Anyways, it's a FIXME. Otherwise, LGTM. 191307 4 dpranke 2010-02-17 17:10:10 -0800 please reformat this to stay within 80 columns as per the PEP 8 style guide :) I think this patch is safe, but is basically rearranging ugly code. You put a FIXME in somewhere to just collapse the two classes, and I agree that that would probably be a better way to fix this. Is there some reason you're not doing that as part of this patch? Also, I believe this --run-singly option is only used by the valgrind bots (presumably to help ensure clean test runs); you might put a comment into the code somewhere to indicate this, so people can understand why we need this option at all. 191437 5 48933 abarth 2010-02-17 23:58:36 -0800 Comment on attachment 48933 Patch I'm mostly relying on Ojan and Dirk here, but this looks reasonable to me. Please fix the pep8 nits before landing. (We really need to integrate pep8 into the style elf.) 192098 6 eric 2010-02-19 16:23:08 -0800 Attachment 48933 was posted by a committer and has review+, assigning to Eric Seidel for commit. 203749 7 eric 2010-03-24 19:58:54 -0700 Wow. I doubt this still even applies. 203750 8 48933 eric 2010-03-24 19:59:24 -0700 Comment on attachment 48933 Patch We'll see what the cq says. 203858 9 48933 commit-queue 2010-03-25 00:16:53 -0700 Comment on attachment 48933 Patch Rejecting patch 48933 from commit-queue. Failed to run "['/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', '--reviewer', 'Adam Barth', '--force']" exit_code: 1 Last 500 characters of output: itpy/layout_tests/layout_package/test_shell_thread.py Hunk #1 FAILED at 48. Hunk #2 succeeded at 62 (offset 3 lines). Hunk #3 succeeded at 143 (offset 3 lines). Hunk #4 FAILED at 156. Hunk #5 succeeded at 180 (offset 3 lines). Hunk #6 succeeded at 276 with fuzz 1 (offset 3 lines). Hunk #7 succeeded at 287 (offset 3 lines). Hunk #8 succeeded at 412 (offset 3 lines). 2 out of 8 hunks FAILED -- saving rejects to file WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_shell_thread.py.rej Full output: http://webkit-commit-queue.appspot.com/results/1203028 222772 10 eric 2010-05-07 20:05:15 -0700 This patch is too out of date to save. I'll redo this at a later date. 48933 2010-02-17 13:41:26 -0800 2010-03-25 00:16:52 -0700 Patch bug-35055-20100217134125.patch text/plain 11786 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2Y2ZmODgyLi5jYzljMDZkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDIt MTcgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNpbmdsZVRlc3RUaHJlYWQgYW5kIFRlc3RTaGVs bFRocmVhZCBzaG91bGQgc2hhcmUgbW9yZSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTA1NQorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9zaGVsbF90aHJlYWQucHk6CisgICAg ICAgICAtIEFkZCBhIG5ldyBjbGFzcyBUZXN0VGhyZWFkIGFuZCBtb3ZlIHByb2Nlc3Nfb3V0cHV0 IGludG8gaXQuCisgICAgICAgICAtIFNoYXJlIGluc3RhbmNlIHZhcmlhYmxlcyBiZXR3ZWVuIFNp bmdsZVRlc3RUaHJlYWQgYW5kIFRlc3RTaGVsbFRocmVhZC4KKwogMjAxMC0wMi0xNiAgRXJpYyBT ZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0 aC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2xheW91dF9wYWNrYWdlL3Rlc3Rfc2hlbGxfdGhyZWFkLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9zaGVsbF90aHJlYWQu cHkKaW5kZXggMzQ1MjAzNS4uYWFiMWE5MiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9zaGVsbF90aHJlYWQu cHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0 X3BhY2thZ2UvdGVzdF9zaGVsbF90aHJlYWQucHkKQEAgLTQ4LDY5ICs0OCw2IEBAIGltcG9ydCB0 aW1lCiBpbXBvcnQgdGVzdF9mYWlsdXJlcwogCiAKLWRlZiBwcm9jZXNzX291dHB1dChwb3J0LCB0 ZXN0X2luZm8sIHRlc3RfdHlwZXMsIHRlc3RfYXJncywgdGFyZ2V0LCBvdXRwdXRfZGlyLAotICAg ICAgICAgICAgICAgICAgIGNyYXNoLCB0aW1lb3V0LCB0ZXN0X3J1bl90aW1lLCBhY3R1YWxfY2hl Y2tzdW0sCi0gICAgICAgICAgICAgICAgICAgb3V0cHV0LCBlcnJvcik6Ci0gICAgIiIiUmVjZWl2 ZXMgdGhlIG91dHB1dCBmcm9tIGEgdGVzdF9zaGVsbCBwcm9jZXNzLCBzdWJqZWN0cyBpdCB0byBh IG51bWJlcgotICAgIG9mIHRlc3RzLCBhbmQgcmV0dXJucyBhIGxpc3Qgb2YgZmFpbHVyZSB0eXBl cyB0aGUgdGVzdCBwcm9kdWNlZC4KLQotICAgIEFyZ3M6Ci0gICAgICBwb3J0OiBwb3J0LXNwZWNp ZmljIGhvb2tzCi0gICAgICBwcm9jOiBhbiBhY3RpdmUgdGVzdF9zaGVsbCBwcm9jZXNzCi0gICAg ICB0ZXN0X2luZm86IE9iamVjdCBjb250YWluaW5nIHRoZSB0ZXN0IGZpbGVuYW1lLCB1cmkgYW5k IHRpbWVvdXQKLSAgICAgIHRlc3RfdHlwZXM6IGxpc3Qgb2YgdGVzdCB0eXBlcyB0byBzdWJqZWN0 IHRoZSBvdXRwdXQgdG8KLSAgICAgIHRlc3RfYXJnczogYXJndW1lbnRzIHRvIGJlIHBhc3NlZCB0 byBlYWNoIHRlc3QKLSAgICAgIHRhcmdldDogRGVidWcgb3IgUmVsZWFzZQotICAgICAgb3V0cHV0 X2RpcjogZGlyZWN0b3J5IHRvIHB1dCBjcmFzaCBzdGFjayB0cmFjZXMgaW50bwotCi0gICAgUmV0 dXJuczogYSBsaXN0IG9mIGZhaWx1cmUgb2JqZWN0cyBhbmQgdGltZXMgZm9yIHRoZSB0ZXN0IGJl aW5nIHByb2Nlc3NlZAotICAgICIiIgotICAgIGZhaWx1cmVzID0gW10KLQotICAgICMgU29tZSB0 ZXN0IGFyZ3MsIHN1Y2ggYXMgdGhlIGltYWdlIGhhc2gsIG1heSBiZSBhZGRlZCBvciBjaGFuZ2Vk IG9uIGEKLSAgICAjIHRlc3QtYnktdGVzdCBiYXNpcy4KLSAgICBsb2NhbF90ZXN0X2FyZ3MgPSBj b3B5LmNvcHkodGVzdF9hcmdzKQotCi0gICAgbG9jYWxfdGVzdF9hcmdzLmhhc2ggPSBhY3R1YWxf Y2hlY2tzdW0KLQotICAgIGlmIGNyYXNoOgotICAgICAgICBmYWlsdXJlcy5hcHBlbmQodGVzdF9m YWlsdXJlcy5GYWlsdXJlQ3Jhc2goKSkKLSAgICBpZiB0aW1lb3V0OgotICAgICAgICBmYWlsdXJl cy5hcHBlbmQodGVzdF9mYWlsdXJlcy5GYWlsdXJlVGltZW91dCgpKQotCi0gICAgaWYgY3Jhc2g6 Ci0gICAgICAgIGxvZ2dpbmcuZGVidWcoIlN0YWNrdHJhY2UgZm9yICVzOlxuJXMiICUgKHRlc3Rf aW5mby5maWxlbmFtZSwgZXJyb3IpKQotICAgICAgICAjIFN0cmlwIG9mZiAiZmlsZTovLyIgc2lu Y2UgUmVsYXRpdmVUZXN0RmlsZW5hbWUgZXhwZWN0cwotICAgICAgICAjIGZpbGVzeXN0ZW0gcGF0 aHMuCi0gICAgICAgIGZpbGVuYW1lID0gb3MucGF0aC5qb2luKG91dHB1dF9kaXIsIHRlc3RfaW5m by5maWxlbmFtZSkKLSAgICAgICAgZmlsZW5hbWUgPSBvcy5wYXRoLnNwbGl0ZXh0KGZpbGVuYW1l KVswXSArICItc3RhY2sudHh0IgotICAgICAgICBwb3J0Lm1heWJlX21ha2VfZGlyZWN0b3J5KG9z LnBhdGguc3BsaXQoZmlsZW5hbWUpWzBdKQotICAgICAgICBvcGVuKGZpbGVuYW1lLCAid2IiKS53 cml0ZShlcnJvcikKLSAgICBlbGlmIGVycm9yOgotICAgICAgICBsb2dnaW5nLmRlYnVnKCJQcmV2 aW91cyB0ZXN0IG91dHB1dCBleHRyYSBsaW5lcyBhZnRlciBkdW1wOlxuJXMiICUKLSAgICAgICAg ICAgIGVycm9yKQotCi0gICAgIyBDaGVjayB0aGUgb3V0cHV0IGFuZCBzYXZlIHRoZSByZXN1bHRz LgotICAgIHN0YXJ0X3RpbWUgPSB0aW1lLnRpbWUoKQotICAgIHRpbWVfZm9yX2RpZmZzID0ge30K LSAgICBmb3IgdGVzdF90eXBlIGluIHRlc3RfdHlwZXM6Ci0gICAgICAgIHN0YXJ0X2RpZmZfdGlt ZSA9IHRpbWUudGltZSgpCi0gICAgICAgIG5ld19mYWlsdXJlcyA9IHRlc3RfdHlwZS5jb21wYXJl X291dHB1dChwb3J0LCB0ZXN0X2luZm8uZmlsZW5hbWUsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBvdXRwdXQsIGxvY2FsX3Rlc3RfYXJncywKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRhcmdldCkKLSAgICAg ICAgIyBEb24ndCBhZGQgYW55IG1vcmUgZmFpbHVyZXMgaWYgd2UgYWxyZWFkeSBoYXZlIGEgY3Jh c2gsIHNvIHdlIGRvbid0Ci0gICAgICAgICMgZG91YmxlLXJlcG9ydCB0aG9zZSB0ZXN0cy4gV2Ug ZG8gZG91YmxlLXJlcG9ydCBmb3IgdGltZW91dHMgc2luY2UKLSAgICAgICAgIyB3ZSBzdGlsbCB3 YW50IHRvIHNlZSB0aGUgdGV4dCBhbmQgaW1hZ2Ugb3V0cHV0LgotICAgICAgICBpZiBub3QgY3Jh c2g6Ci0gICAgICAgICAgICBmYWlsdXJlcy5leHRlbmQobmV3X2ZhaWx1cmVzKQotICAgICAgICB0 aW1lX2Zvcl9kaWZmc1t0ZXN0X3R5cGUuX19jbGFzc19fLl9fbmFtZV9fXSA9ICgKLSAgICAgICAg ICAgIHRpbWUudGltZSgpIC0gc3RhcnRfZGlmZl90aW1lKQotCi0gICAgdG90YWxfdGltZV9mb3Jf YWxsX2RpZmZzID0gdGltZS50aW1lKCkgLSBzdGFydF9kaWZmX3RpbWUKLSAgICByZXR1cm4gVGVz dFN0YXRzKHRlc3RfaW5mby5maWxlbmFtZSwgZmFpbHVyZXMsIHRlc3RfcnVuX3RpbWUsCi0gICAg ICAgIHRvdGFsX3RpbWVfZm9yX2FsbF9kaWZmcywgdGltZV9mb3JfZGlmZnMpCi0KLQogY2xhc3Mg VGVzdFN0YXRzOgogCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIGZpbGVuYW1lLCBmYWlsdXJlcywg dGVzdF9ydW5fdGltZSwKQEAgLTEyMiw3ICs1OSw3NSBAQCBjbGFzcyBUZXN0U3RhdHM6CiAgICAg ICAgIHNlbGYudGltZV9mb3JfZGlmZnMgPSB0aW1lX2Zvcl9kaWZmcwogCiAKLWNsYXNzIFNpbmds ZVRlc3RUaHJlYWQodGhyZWFkaW5nLlRocmVhZCk6CitjbGFzcyBUZXN0VGhyZWFkKHRocmVhZGlu Zy5UaHJlYWQpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0LCBpbWFnZV9wYXRoLCBzaGVs bF9hcmdzLCB0ZXN0X3R5cGVzLCB0ZXN0X2FyZ3MpOgorICAgICAgICB0aHJlYWRpbmcuVGhyZWFk Ll9faW5pdF9fKHNlbGYpCisgICAgICAgIHNlbGYuX3BvcnQgPSBwb3J0CisgICAgICAgIHNlbGYu X2ltYWdlX3BhdGggPSBpbWFnZV9wYXRoCisgICAgICAgIHNlbGYuX3NoZWxsX2FyZ3MgPSBzaGVs bF9hcmdzCisgICAgICAgIHNlbGYuX3Rlc3RfdHlwZXMgPSB0ZXN0X3R5cGVzCisgICAgICAgIHNl bGYuX3Rlc3RfYXJncyA9IHRlc3RfYXJncworCisgICAgZGVmIHByb2Nlc3Nfb3V0cHV0KHRlc3Rf aW5mbywgdGFyZ2V0LCBvdXRwdXRfZGlyLAorICAgICAgICAgICAgICAgICAgICAgICBjcmFzaCwg dGltZW91dCwgdGVzdF9ydW5fdGltZSwgYWN0dWFsX2NoZWNrc3VtLAorICAgICAgICAgICAgICAg ICAgICAgICBvdXRwdXQsIGVycm9yKToKKyAgICAgICAgIiIiUmVjZWl2ZXMgdGhlIG91dHB1dCBm cm9tIGEgdGVzdF9zaGVsbCBwcm9jZXNzLCBzdWJqZWN0cyBpdCB0byBhIG51bWJlcgorICAgICAg ICBvZiB0ZXN0cywgYW5kIHJldHVybnMgYSBsaXN0IG9mIGZhaWx1cmUgdHlwZXMgdGhlIHRlc3Qg cHJvZHVjZWQuCisKKyAgICAgICAgQXJnczoKKyAgICAgICAgICB0ZXN0X2luZm86IE9iamVjdCBj b250YWluaW5nIHRoZSB0ZXN0IGZpbGVuYW1lLCB1cmkgYW5kIHRpbWVvdXQKKyAgICAgICAgICB0 YXJnZXQ6IERlYnVnIG9yIFJlbGVhc2UKKyAgICAgICAgICBvdXRwdXRfZGlyOiBkaXJlY3Rvcnkg dG8gcHV0IGNyYXNoIHN0YWNrIHRyYWNlcyBpbnRvCisKKyAgICAgICAgUmV0dXJuczogYSBsaXN0 IG9mIGZhaWx1cmUgb2JqZWN0cyBhbmQgdGltZXMgZm9yIHRoZSB0ZXN0IGJlaW5nIHByb2Nlc3Nl ZAorICAgICAgICAiIiIKKyAgICAgICAgZmFpbHVyZXMgPSBbXQorCisgICAgICAgICMgU29tZSB0 ZXN0IGFyZ3MsIHN1Y2ggYXMgdGhlIGltYWdlIGhhc2gsIG1heSBiZSBhZGRlZCBvciBjaGFuZ2Vk IG9uIGEKKyAgICAgICAgIyB0ZXN0LWJ5LXRlc3QgYmFzaXMuCisgICAgICAgIGxvY2FsX3Rlc3Rf YXJncyA9IGNvcHkuY29weShzZWxmLl90ZXN0X2FyZ3MpCisgICAgICAgIGxvY2FsX3Rlc3RfYXJn cy5oYXNoID0gYWN0dWFsX2NoZWNrc3VtCisKKyAgICAgICAgaWYgY3Jhc2g6CisgICAgICAgICAg ICBmYWlsdXJlcy5hcHBlbmQodGVzdF9mYWlsdXJlcy5GYWlsdXJlQ3Jhc2goKSkKKyAgICAgICAg aWYgdGltZW91dDoKKyAgICAgICAgICAgIGZhaWx1cmVzLmFwcGVuZCh0ZXN0X2ZhaWx1cmVzLkZh aWx1cmVUaW1lb3V0KCkpCisKKyAgICAgICAgaWYgY3Jhc2g6CisgICAgICAgICAgICBsb2dnaW5n LmRlYnVnKCJTdGFja3RyYWNlIGZvciAlczpcbiVzIiAlICh0ZXN0X2luZm8uZmlsZW5hbWUsIGVy cm9yKSkKKyAgICAgICAgICAgICMgU3RyaXAgb2ZmICJmaWxlOi8vIiBzaW5jZSBSZWxhdGl2ZVRl c3RGaWxlbmFtZSBleHBlY3RzCisgICAgICAgICAgICAjIGZpbGVzeXN0ZW0gcGF0aHMuCisgICAg ICAgICAgICBmaWxlbmFtZSA9IG9zLnBhdGguam9pbihvdXRwdXRfZGlyLCB0ZXN0X2luZm8uZmls ZW5hbWUpCisgICAgICAgICAgICBmaWxlbmFtZSA9IG9zLnBhdGguc3BsaXRleHQoZmlsZW5hbWUp WzBdICsgIi1zdGFjay50eHQiCisgICAgICAgICAgICBzZWxmLl9wb3J0Lm1heWJlX21ha2VfZGly ZWN0b3J5KG9zLnBhdGguc3BsaXQoZmlsZW5hbWUpWzBdKQorICAgICAgICAgICAgb3BlbihmaWxl bmFtZSwgIndiIikud3JpdGUoZXJyb3IpCisgICAgICAgIGVsaWYgZXJyb3I6CisgICAgICAgICAg ICBsb2dnaW5nLmRlYnVnKCJQcmV2aW91cyB0ZXN0IG91dHB1dCBleHRyYSBsaW5lcyBhZnRlciBk dW1wOlxuJXMiICUKKyAgICAgICAgICAgICAgICBlcnJvcikKKworICAgICAgICAjIENoZWNrIHRo ZSBvdXRwdXQgYW5kIHNhdmUgdGhlIHJlc3VsdHMuCisgICAgICAgIHN0YXJ0X3RpbWUgPSB0aW1l LnRpbWUoKQorICAgICAgICB0aW1lX2Zvcl9kaWZmcyA9IHt9CisgICAgICAgIGZvciB0ZXN0X3R5 cGUgaW4gc2VsZi5fdGVzdF90eXBlczoKKyAgICAgICAgICAgIHN0YXJ0X2RpZmZfdGltZSA9IHRp bWUudGltZSgpCisgICAgICAgICAgICBuZXdfZmFpbHVyZXMgPSB0ZXN0X3R5cGUuY29tcGFyZV9v dXRwdXQoc2VsZi5fcG9ydCwgdGVzdF9pbmZvLmZpbGVuYW1lLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG91dHB1dCwgbG9jYWxfdGVzdF9hcmdz LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRh cmdldCkKKyAgICAgICAgICAgICMgRG9uJ3QgYWRkIGFueSBtb3JlIGZhaWx1cmVzIGlmIHdlIGFs cmVhZHkgaGF2ZSBhIGNyYXNoLCBzbyB3ZSBkb24ndAorICAgICAgICAgICAgIyBkb3VibGUtcmVw b3J0IHRob3NlIHRlc3RzLiBXZSBkbyBkb3VibGUtcmVwb3J0IGZvciB0aW1lb3V0cyBzaW5jZQor ICAgICAgICAgICAgIyB3ZSBzdGlsbCB3YW50IHRvIHNlZSB0aGUgdGV4dCBhbmQgaW1hZ2Ugb3V0 cHV0LgorICAgICAgICAgICAgaWYgbm90IGNyYXNoOgorICAgICAgICAgICAgICAgIGZhaWx1cmVz LmV4dGVuZChuZXdfZmFpbHVyZXMpCisgICAgICAgICAgICB0aW1lX2Zvcl9kaWZmc1t0ZXN0X3R5 cGUuX19jbGFzc19fLl9fbmFtZV9fXSA9ICgKKyAgICAgICAgICAgICAgICB0aW1lLnRpbWUoKSAt IHN0YXJ0X2RpZmZfdGltZSkKKworICAgICAgICB0b3RhbF90aW1lX2Zvcl9hbGxfZGlmZnMgPSB0 aW1lLnRpbWUoKSAtIHN0YXJ0X2RpZmZfdGltZQorICAgICAgICByZXR1cm4gVGVzdFN0YXRzKHRl c3RfaW5mby5maWxlbmFtZSwgZmFpbHVyZXMsIHRlc3RfcnVuX3RpbWUsCisgICAgICAgICAgICB0 b3RhbF90aW1lX2Zvcl9hbGxfZGlmZnMsIHRpbWVfZm9yX2RpZmZzKQorCisjIEZJWE1FOiBXaHkg ZG8gd2UgbmVlZCBhIHNlcGFyYXRlIGNsYXNzIHRvIGhhbmRsZSAtLXNpbmdseT8gIENhbid0IHdl IGp1c3QgdXNlIG1hbnkKKyMgVGVzdFNoZWxsVGhyZWFkcyBhbmQgb25seSBmZWVkIGVhY2ggb25l IHRlc3Q/CitjbGFzcyBTaW5nbGVUZXN0VGhyZWFkKFRlc3RUaHJlYWQpOgogICAgICIiIlRocmVh ZCB3cmFwcGVyIGZvciBydW5uaW5nIGEgc2luZ2xlIHRlc3QgZmlsZS4iIiIKIAogICAgIGRlZiBf X2luaXRfXyhzZWxmLCBwb3J0LCBpbWFnZV9wYXRoLCBzaGVsbF9hcmdzLCB0ZXN0X2luZm8sCkBA IC0xMzUsMTMgKzE0MCw4IEBAIGNsYXNzIFNpbmdsZVRlc3RUaHJlYWQodGhyZWFkaW5nLlRocmVh ZCk6CiAgICAgICAgICAgU2VlIFRlc3RTaGVsbFRocmVhZCBmb3IgZG9jdW1lbnRhdGlvbiBvZiB0 aGUgcmVtYWluaW5nIGFyZ3VtZW50cy4KICAgICAgICAgIiIiCiAKLSAgICAgICAgdGhyZWFkaW5n LlRocmVhZC5fX2luaXRfXyhzZWxmKQotICAgICAgICBzZWxmLl9wb3J0ID0gcG9ydAotICAgICAg ICBzZWxmLl9pbWFnZV9wYXRoID0gaW1hZ2VfcGF0aAotICAgICAgICBzZWxmLl9zaGVsbF9hcmdz ID0gc2hlbGxfYXJncworICAgICAgICBUZXN0VGhyZWFkLl9faW5pdF9fKHNlbGYsIHBvcnQsIGlt YWdlX3BhdGgsIHNoZWxsX2FyZ3MsIHRlc3RfdHlwZXMsIHRlc3RfYXJncykKICAgICAgICAgc2Vs Zi5fdGVzdF9pbmZvID0gdGVzdF9pbmZvCi0gICAgICAgIHNlbGYuX3Rlc3RfdHlwZXMgPSB0ZXN0 X3R5cGVzCi0gICAgICAgIHNlbGYuX3Rlc3RfYXJncyA9IHRlc3RfYXJncwogICAgICAgICBzZWxm Ll90YXJnZXQgPSB0YXJnZXQKICAgICAgICAgc2VsZi5fb3V0cHV0X2RpciA9IG91dHB1dF9kaXIK IApAQCAtMTUzLDE3ICsxNTMsMTYgQEAgY2xhc3MgU2luZ2xlVGVzdFRocmVhZCh0aHJlYWRpbmcu VGhyZWFkKToKICAgICAgICAgICAgIGRyaXZlci5ydW5fdGVzdCh0ZXN0X2luZm8udXJpLnN0cmlw KCksIHRlc3RfaW5mby50aW1lb3V0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRlc3Rf aW5mby5pbWFnZV9oYXNoKQogICAgICAgICBlbmQgPSB0aW1lLnRpbWUoKQotICAgICAgICBzZWxm Ll90ZXN0X3N0YXRzID0gcHJvY2Vzc19vdXRwdXQoc2VsZi5fcG9ydCwKLSAgICAgICAgICAgIHNl bGYuX3Rlc3RfaW5mbywgc2VsZi5fdGVzdF90eXBlcywgc2VsZi5fdGVzdF9hcmdzLAotICAgICAg ICAgICAgc2VsZi5fdGFyZ2V0LCBzZWxmLl9vdXRwdXRfZGlyLCBjcmFzaCwgdGltZW91dCwgZW5k IC0gc3RhcnQsCi0gICAgICAgICAgICBhY3R1YWxfY2hlY2tzdW0sIG91dHB1dCwgZXJyb3IpCisg ICAgICAgIHNlbGYuX3Rlc3Rfc3RhdHMgPSBzZWxmLnByb2Nlc3Nfb3V0cHV0KHNlbGYuX3Rlc3Rf aW5mbywgc2VsZi5fdGFyZ2V0LAorICAgICAgICAgICAgc2VsZi5fb3V0cHV0X2RpciwgY3Jhc2gs IHRpbWVvdXQsIGVuZCAtIHN0YXJ0LCBhY3R1YWxfY2hlY2tzdW0sCisgICAgICAgICAgICBvdXRw dXQsIGVycm9yKQogICAgICAgICBkcml2ZXIuc3RvcCgpCiAKICAgICBkZWYgZ2V0X3Rlc3Rfc3Rh dHMoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl90ZXN0X3N0YXRzCiAKIAotY2xhc3MgVGVz dFNoZWxsVGhyZWFkKHRocmVhZGluZy5UaHJlYWQpOgorY2xhc3MgVGVzdFNoZWxsVGhyZWFkKFRl c3RUaHJlYWQpOgogCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnQsIGZpbGVuYW1lX2xpc3Rf cXVldWUsIHJlc3VsdF9xdWV1ZSwKICAgICAgICAgICAgICAgICAgdGVzdF90eXBlcywgdGVzdF9h cmdzLCBpbWFnZV9wYXRoLCBzaGVsbF9hcmdzLCBvcHRpb25zKToKQEAgLTE3OCwyMSArMTc3LDE2 IEBAIGNsYXNzIFRlc3RTaGVsbFRocmVhZCh0aHJlYWRpbmcuVGhyZWFkKToKICAgICAgICAgICB0 ZXN0X3R5cGVzOiBBIGxpc3Qgb2YgVGVzdFR5cGUgb2JqZWN0cyB0byBydW4gdGhlIHRlc3Qgb3V0 cHV0CiAgICAgICAgICAgICAgIGFnYWluc3QuCiAgICAgICAgICAgdGVzdF9hcmdzOiBBIFRlc3RB cmd1bWVudHMgb2JqZWN0IHRvIHBhc3MgdG8gZWFjaCBUZXN0VHlwZS4KLSAgICAgICAgICBzaGVs bF9hcmdzOiBBbnkgZXh0cmEgYXJndW1lbnRzIHRvIGJlIHBhc3NlZCB0byB0ZXN0X3NoZWxsLmV4 ZS4KKyAgICAgICAgICBzaGVsbF9hcmdzOiBBbnkgZXh0cmEgYXJndW1lbnRzIHRvIGJlIHBhc3Nl ZCB0byB0aGUgdGVzdCBkcml2ZXIuCiAgICAgICAgICAgb3B0aW9uczogQSBwcm9wZXJ0eSBkaWN0 aW9uYXJ5IGFzIHByb2R1Y2VkIGJ5IG9wdHBhcnNlLiBUaGUKICAgICAgICAgICAgICAgY29tbWFu ZC1saW5lIG9wdGlvbnMgc2hvdWxkIG1hdGNoIHRob3NlIGV4cGVjdGVkIGJ5CiAgICAgICAgICAg ICAgIHJ1bl93ZWJraXRfdGVzdHM7IHRoZXkgYXJlIHR5cGljYWxseSBwYXNzZWQgdmlhIHRoZQog ICAgICAgICAgICAgICBydW5fd2Via2l0X3Rlc3RzLlRlc3RSdW5uZXIgY2xhc3MuIiIiCi0gICAg ICAgIHRocmVhZGluZy5UaHJlYWQuX19pbml0X18oc2VsZikKLSAgICAgICAgc2VsZi5fcG9ydCA9 IHBvcnQKKyAgICAgICAgVGVzdFRocmVhZC5fX2luaXRfXyhzZWxmLCBwb3J0LCBpbWFnZV9wYXRo LCBzaGVsbF9hcmdzLCB0ZXN0X3R5cGVzLCB0ZXN0X2FyZ3MpCiAgICAgICAgIHNlbGYuX2ZpbGVu YW1lX2xpc3RfcXVldWUgPSBmaWxlbmFtZV9saXN0X3F1ZXVlCiAgICAgICAgIHNlbGYuX3Jlc3Vs dF9xdWV1ZSA9IHJlc3VsdF9xdWV1ZQogICAgICAgICBzZWxmLl9maWxlbmFtZV9saXN0ID0gW10K LSAgICAgICAgc2VsZi5fdGVzdF90eXBlcyA9IHRlc3RfdHlwZXMKLSAgICAgICAgc2VsZi5fdGVz dF9hcmdzID0gdGVzdF9hcmdzCiAgICAgICAgIHNlbGYuX2RyaXZlciA9IE5vbmUKLSAgICAgICAg c2VsZi5faW1hZ2VfcGF0aCA9IGltYWdlX3BhdGgKLSAgICAgICAgc2VsZi5fc2hlbGxfYXJncyA9 IHNoZWxsX2FyZ3MKICAgICAgICAgc2VsZi5fb3B0aW9ucyA9IG9wdGlvbnMKICAgICAgICAgc2Vs Zi5fY2FuY2VsZWQgPSBGYWxzZQogICAgICAgICBzZWxmLl9leGNlcHRpb25faW5mbyA9IE5vbmUK QEAgLTI3OSw3ICsyNzMsNyBAQCBjbGFzcyBUZXN0U2hlbGxUaHJlYWQodGhyZWFkaW5nLlRocmVh ZCk6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX29wdGlvbnMuYmF0Y2hfc2l6 ZSkKIAogICAgICAgICAjIEFwcGVuZCB0ZXN0cyB3ZSdyZSBydW5uaW5nIHRvIHRoZSBleGlzdGlu ZyB0ZXN0c19ydW4udHh0IGZpbGUuCi0gICAgICAgICMgVGhpcyBpcyBjcmVhdGVkIGluIHJ1bl93 ZWJraXRfdGVzdHMucHk6X1ByZXBhcmVMaXN0c0FuZFByaW50T3V0cHV0LgorICAgICAgICAjIFRo aXMgaXMgY3JlYXRlZCBpbiBUZXN0UnVubmVyLnByZXBhcmVfbGlzdHNfYW5kX3ByaW50X291dHB1 dC4KICAgICAgICAgdGVzdHNfcnVuX2ZpbGVuYW1lID0gb3MucGF0aC5qb2luKHNlbGYuX29wdGlv bnMucmVzdWx0c19kaXJlY3RvcnksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAidGVzdHNfcnVuLnR4dCIpCiAgICAgICAgIHRlc3RzX3J1bl9maWxlID0gb3Blbih0 ZXN0c19ydW5fZmlsZW5hbWUsICJhIikKQEAgLTI5MCw4ICsyODQsOCBAQCBjbGFzcyBUZXN0U2hl bGxUaHJlYWQodGhyZWFkaW5nLlRocmVhZCk6CiAgICAgICAgICAgICAgICAgdGVzdHNfcnVuX2Zp bGUuY2xvc2UoKQogICAgICAgICAgICAgICAgIHJldHVybgogCi0gICAgICAgICAgICBpZiBsZW4o c2VsZi5fZmlsZW5hbWVfbGlzdCkgaXMgMDoKLSAgICAgICAgICAgICAgICBpZiBzZWxmLl9jdXJy ZW50X2RpciBpcyBub3QgTm9uZToKKyAgICAgICAgICAgIGlmIG5vdCBzZWxmLl9maWxlbmFtZV9s aXN0OgorICAgICAgICAgICAgICAgIGlmIHNlbGYuX2N1cnJlbnRfZGlyOgogICAgICAgICAgICAg ICAgICAgICBzZWxmLl9kaXJlY3RvcnlfdGltaW5nX3N0YXRzW3NlbGYuX2N1cnJlbnRfZGlyXSA9 IFwKICAgICAgICAgICAgICAgICAgICAgICAgIChzZWxmLl9udW1fdGVzdHNfaW5fY3VycmVudF9k aXIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgdGltZS50aW1lKCkgLSBzZWxmLl9jdXJyZW50 X2Rpcl9zdGFydF90aW1lKQpAQCAtNDE1LDExICs0MDksOSBAQCBjbGFzcyBUZXN0U2hlbGxUaHJl YWQodGhyZWFkaW5nLlRocmVhZCk6CiAgICAgICAgICAgIHNlbGYuX2RyaXZlci5ydW5fdGVzdCh0 ZXN0X2luZm8udXJpLCB0ZXN0X2luZm8udGltZW91dCwgaW1hZ2VfaGFzaCkKICAgICAgICAgZW5k ID0gdGltZS50aW1lKCkKIAotICAgICAgICBzdGF0cyA9IHByb2Nlc3Nfb3V0cHV0KHNlbGYuX3Bv cnQsIHRlc3RfaW5mbywgc2VsZi5fdGVzdF90eXBlcywKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBzZWxmLl90ZXN0X2FyZ3MsIHNlbGYuX29wdGlvbnMudGFyZ2V0LAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX29wdGlvbnMucmVzdWx0c19kaXJlY3RvcnksIGNy YXNoLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVvdXQsIGVuZCAtIHN0YXJ0 LCBhY3R1YWxfY2hlY2tzdW0sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3V0cHV0 LCBlcnJvcikKKyAgICAgICAgc3RhdHMgPSBzZWxmLnByb2Nlc3Nfb3V0cHV0KHRlc3RfaW5mbywg c2VsZi5fb3B0aW9ucy50YXJnZXQsCisgICAgICAgICAgICBzZWxmLl9vcHRpb25zLnJlc3VsdHNf ZGlyZWN0b3J5LCBjcmFzaCwgdGltZW91dCwgZW5kIC0gc3RhcnQsCisgICAgICAgICAgICBhY3R1 YWxfY2hlY2tzdW0sIG91dHB1dCwgZXJyb3IpCiAKICAgICAgICAgc2VsZi5fdGVzdF9zdGF0cy5h cHBlbmQoc3RhdHMpCiAgICAgICAgIHJldHVybiBzdGF0cy5mYWlsdXJlcwo=