56760 2011-03-21 11:38:34 -0700 new-run-webkit-tests: run tests in ascending alphabetical order per dir 2011-03-23 15:35:12 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 56801 56047 1 dpranke dpranke mihaip ojan ossy pfeldman rgabor tony tonyg oldest_to_newest 370499 0 dpranke 2011-03-21 11:38:34 -0700 new-run-webkit-tests: run tests in ascending alphabetical order per dir 370803 1 86345 dpranke 2011-03-21 11:56:41 -0700 Created attachment 86345 Patch 370820 2 dpranke 2011-03-21 12:10:13 -0700 Committed r81597: <http://trac.webkit.org/changeset/81597> 371209 3 mihaip 2011-03-21 22:21:55 -0700 Pavel is rolling this out because on the Chromium bots the http/ tests are being run backwards. From http://build.chromium.org/p/chromium.webkit/builders/Webkit%20Linux/builds/4600/steps/webkit_tests/logs/stdio: worker-0 http/tests/loading/preload-img-test.html passed worker-0 http/tests/loading/onload-vs-immediate-refresh.pl worker-0 http/tests/loading/location-hash-reload-cycle.html worker-0 http/tests/loading/load-javascript-after-many-xhrs.html passed 371215 4 dpranke 2011-03-21 22:29:13 -0700 Fascinating. I wonder how that is possible. If that is the case, it probably would've been clearer to say "tests are being run backwards" in the other bug rather than "tests are unexpectedly flaky". 371929 5 dpranke 2011-03-22 19:57:53 -0700 Reopening, because it was rolled out in http://trac.webkit.org/changeset/81675. So, this code has been broken for quite a while, at least since http://trac.webkit.org/changeset/68903 and http://trac.webkit.org/changeset/69074. There are four paths through the "sharding" code, depending on whether we're running through the single-threaded path (which triggers if you're running with --worker-model=inline or --child-processes=1, or, less commonly, if you're running with --experimental-fully-parallel), or through the multi-threaded path. If you run through the single-threaded path, then test are either put into the http_lock bucket (in order) or to their own bucket. Then the tests in the http_lock bucket are reversed. The net result is that http tests are in a single batch backwards but all the other tests are individual batches of one file each. The --worker-model={old-threads,old-inline} would then get the list of reversed tests and *pop* them one at a time and run them, hence effectively reversing the http tests again and having no effect on the other batches. The net result would be that everything would run in order. In the multithreaded case, we would use real batches for the non-http tests, but we would reverse each batch, so that again, popping them would work and they'd be run in order. The new worker model code, however, doesn't pop items from the batches, it iterates over them in order. The net result is that in the single-threaded case, we run the http tests in reverse and the other tests in order, and in the multi-threaded case, we run everything in reverse per directory (which is what the bots are currently doing). One solution could be to change the sharding logic to leave the reverses in for the old-* worker models, and take the reverses out for the new worker models. Another would be to take the reverses out, and change the old-* implementations to pop from the front of the batch rather than pop from the end. A third would be to change the new-* implementations to pop the tests rather than iterate over them. Since my long term plan is to delete the old implementations, I suggest that we take the reverses out and change the old-* implementation to pop from the front of the batch. Anyone disagree? Note that the real implication of all of this is that currently Chromium is running the tests backwards by default, and the test_expectations are set to deal with that. When we "fix" this to run them forwards, we will get a bunch of diffs and have to adjust for them. This will probably require some coordinating with the gardeners. 371938 6 ojan 2011-03-22 20:16:16 -0700 (In reply to comment #5) > Since my long term plan is to delete the old implementations, I suggest that we take the reverses out and change the old-* implementation to pop from the front of the batch. > > Anyone disagree? Sounds good to me. > Note that the real implication of all of this is that currently Chromium is running the tests backwards by default, and the test_expectations are set to deal with that. When we "fix" this to run them forwards, we will get a bunch of diffs and have to adjust for them. This will probably require some coordinating with the gardeners. Sigh. This is just a pain we'll have to deal with. I don't understand though. Looking at the bot stdio, they seem to be running them in alphabetical order per worker. 371945 7 dpranke 2011-03-22 20:30:02 -0700 (In reply to comment #6) > Sigh. This is just a pain we'll have to deal with. I don't understand though. Looking at the bot stdio, they seem to be running them in alphabetical order per worker. Which bot? Mac 10.5 is running them in the correct order because it is single threaded (we hard-code to --worker-model=old-threads and --child-processes=1 because we don't have multiprocessing module on 10.5) Mac 10.6 is running them in reverse order, because it is running --worker-model=processes and multiple children. The Win bots are still running old-threads and hence running them in order, because the last time I tried to switch them over to processes we had a bunch of issues. I need to fix a bug or two and flip the switch again this week. The Linux Hardy bots are still running with --old-threads, presumably because Hardy also only has Python 2.5; the 64-bit bots are running with processes and hence, in reverse order. Fun, huh? 371953 8 ojan 2011-03-22 21:12:58 -0700 I see. I had looked at a Windows bot. 372458 9 86697 dpranke 2011-03-23 14:58:47 -0700 Created attachment 86697 Patch 372498 10 86697 dpranke 2011-03-23 15:35:08 -0700 Comment on attachment 86697 Patch Clearing flags on attachment: 86697 Committed r81815: <http://trac.webkit.org/changeset/81815> 372499 11 dpranke 2011-03-23 15:35:12 -0700 All reviewed patches have been landed. Closing bug. 86345 2011-03-21 11:56:41 -0700 2011-03-23 14:58:45 -0700 Patch bug-56760-20110321115640.patch text/plain 4295 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODE0MjQKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4NzA4ZTcxOTQ3MTM0Y2JlMjRkZDFmMGQ1OTE5Y2I5ZDEx NzNhNTUzLi42ZTY3MDZlMTdiMzI3ZDBjODMxMTBmYTI3MDdkMjAwOGVkNDUwYjhlIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTEtMDMtMjEgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbmV3LXJ1bi13ZWJr aXQtdGVzdHM6IHJ1biB0ZXN0cyBpbiBhc2NlbmRpbmcgYWxwaGFiZXRpY2FsIG9yZGVyIHBlciBk aXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2NzYw CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2Fn ZS90ZXN0X3J1bm5lci5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5weToKKwogMjAxMS0wMy0xNyAgQWRhbSBSb2JlbiAg PGFyb2JlbkBhcHBsZS5jb20+CiAKICAgICAgICAgU2tpcCBhIGNvbXBvc2l0aW5nLXNlbnNpdGl2 ZSB0ZXN0IHdoZW4gYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgaXMgZGlzYWJsZWQKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3Rl c3RfcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0 X3BhY2thZ2UvdGVzdF9ydW5uZXIucHkKaW5kZXggMDg1OWY2OGVlNmFmYjI5NjIyNGNkOGYzMDU2 NDEyYmJmMmZiNmFlMy4uNTYzOTAwOGM0ZTRlMWI4Y2IwMzliZjA1ZmU2ZTc1ZmRjMDRjNDlhYyAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3Bh Y2thZ2UvdGVzdF9ydW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9ydW5uZXIucHkKQEAgLTQ5OCw3ICs0OTgsNiBAQCBj bGFzcyBUZXN0UnVubmVyOgogICAgICAgICAgICAgICAgICMgS2VlcCB0aGUgdGVzdHMgaW4gYWxw aGFiZXRpY2FsIG9yZGVyLgogICAgICAgICAgICAgICAgICMgRklYTUU6IFJlbW92ZSBvbmNlIHRl c3RzIGFyZSBmaXhlZCBzbyB0aGV5IGNhbiBiZSBydW4gaW4gYW55CiAgICAgICAgICAgICAgICAg IyBvcmRlci4KLSAgICAgICAgICAgICAgICB0ZXN0X2xpc3QucmV2ZXJzZSgpCiAgICAgICAgICAg ICAgICAgdGVzdF9saXN0X3R1cGxlID0gKGRpcmVjdG9yeSwgdGVzdF9saXN0KQogICAgICAgICAg ICAgICAgIHRlc3RfbGlzdHMuYXBwZW5kKHRlc3RfbGlzdF90dXBsZSkKICAgICAgICAgICAgIHRl c3RfbGlzdHMuc29ydChsYW1iZGEgYSwgYjogY21wKGxlbihiWzFdKSwgbGVuKGFbMV0pKSkKQEAg LTUwNyw3ICs1MDYsNiBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAgICAgICAjIGJ1dCBlYWNoIGh0 dHAgdGVzdCB0YWtlcyBhIHZlcnkgbG9uZyB0aW1lIHRvIHJ1biwgc28gc29ydGluZyBieSB0aGUK ICAgICAgICAgIyBudW1iZXIgb2YgdGVzdHMgZG9lc24ndCBhY2N1cmF0ZWx5IGNhcHR1cmUgaG93 IGxvbmcgdGhleSB0YWtlIHRvIHJ1bi4KICAgICAgICAgaWYgdGVzdHNfdG9faHR0cF9sb2NrOgot ICAgICAgICAgICAgdGVzdHNfdG9faHR0cF9sb2NrLnJldmVyc2UoKQogICAgICAgICAgICAgdGVz dF9saXN0cy5pbnNlcnQoMCwgKCJ0ZXN0c190b19odHRwX2xvY2siLCB0ZXN0c190b19odHRwX2xv Y2spKQogCiAgICAgICAgIHJldHVybiB0ZXN0X2xpc3RzCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3QucHkKaW5kZXggNGFlYjhiYmViNjkxNGEyYWIw ZWFjNGM4YmNkNzZhYTEyZjRhYzg5Yi4uNmRhZDMzMjUxNTk1M2IwMjEyZThlYzY1ZGRkNjdiNjYx ZTNiZjg2YiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC90ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvdGVzdC5weQpAQCAtMTI4LDYgKzEyOCw3IEBAIGRlZiB1bml0X3Rlc3RfbGlzdCgpOgogICAg ICAgICAgICAgICBhY3R1YWxfY2hlY2tzdW09J3RleHQtaW1hZ2UtY2hlY2tzdW1fZmFpbC1jaGVj a3N1bScpCiAgICAgdGVzdHMuYWRkKCdmYWlsdXJlcy91bmV4cGVjdGVkL3RpbWVvdXQuaHRtbCcs IHRpbWVvdXQ9VHJ1ZSkKICAgICB0ZXN0cy5hZGQoJ2h0dHAvdGVzdHMvcGFzc2VzL3RleHQuaHRt bCcpCisgICAgdGVzdHMuYWRkKCdodHRwL3Rlc3RzL3Bhc3Nlcy9pbWFnZS5odG1sJykKICAgICB0 ZXN0cy5hZGQoJ2h0dHAvdGVzdHMvc3NsL3RleHQuaHRtbCcpCiAgICAgdGVzdHMuYWRkKCdwYXNz ZXMvZXJyb3IuaHRtbCcsIGVycm9yPSdzdHVmZiBnb2luZyB0byBzdGRlcnInKQogICAgIHRlc3Rz LmFkZCgncGFzc2VzL2ltYWdlLmh0bWwnKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkK aW5kZXggZjc1M2YyMzFkZTZjYmRjMmNmYmFmM2Q3OTQ5ZGZhMjYyOWZlMmUwNy4uZmZiOWJhZjli YTYwZjY2MjQ2Nzc4ZDY5MjA2ODllNTkwMTE5NjgwNSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3Vu aXR0ZXN0LnB5CkBAIC00NzAsNiArNDcwLDIyIEBAIGNsYXNzIE1haW5UZXN0KHVuaXR0ZXN0LlRl c3RDYXNlKToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRlc3Rz X2luY2x1ZGVkPVRydWUpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwodXNlci5vcGVuZWRfdXJs cywgWycvdG1wL2Zvby9yZXN1bHRzLmh0bWwnXSkKIAorICAgIGRlZiB0ZXN0X3J1bl9vcmRlcihz ZWxmKToKKyAgICAgICAgIyBUaGlzIHRlc3RzIHRoYXQgd2UgcnVuIHRoZSB0ZXN0cyBpbiBhc2Nl bmRpbmcgYWxwaGFiZXRpY2FsIG9yZGVyCisgICAgICAgICMgcGVyIGRpcmVjdG9yeS4gV2UgaGF2 ZSB0byBjaGVjayBib3RoIHRoZSBpbmxpbmUgYW5kIHRocmVhZGVkIHBhdGhzCisgICAgICAgICMg YXMgd2VsbCBhcyBodHRwIHRlc3RzLCB3aGljaCBhcmUgc2hhcmRlZCBzZXBhcmF0ZWx5LgorICAg ICAgICB0ZXN0c19ydW4gPSBnZXRfdGVzdHNfcnVuKFsncGFzc2VzJ10sCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdGVzdHNfaW5jbHVkZWQ9VHJ1ZSwgZmxhdHRlbl9iYXRjaGVz PVRydWUpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHRlc3RzX3J1biwgc29ydGVkKHRlc3Rz X3J1bikpCisKKyAgICAgICAgdGVzdHNfcnVuID0gZ2V0X3Rlc3RzX3J1bihbJy0td29ya2VyLW1v ZGVsJywgJ3RocmVhZHMnLCAncGFzc2VzJ10sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdGVzdHNfaW5jbHVkZWQ9VHJ1ZSwgZmxhdHRlbl9iYXRjaGVzPVRydWUpCisgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWxzKHRlc3RzX3J1biwgc29ydGVkKHRlc3RzX3J1bikpCisKKyAgICAg ICAgdGVzdHNfcnVuID0gZ2V0X3Rlc3RzX3J1bihbJy0td29ya2VyLW1vZGVsJywgJ2lubGluZScs ICdodHRwL3Rlc3RzL3Bhc3NlcyddLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHRlc3RzX2luY2x1ZGVkPVRydWUsIGZsYXR0ZW5fYmF0Y2hlcz1UcnVlKQorICAgICAgICBzZWxm LmFzc2VydEVxdWFscyh0ZXN0c19ydW4sIHNvcnRlZCh0ZXN0c19ydW4pKQorCiAgICAgZGVmIHRl c3RfdG9sZXJhbmNlKHNlbGYpOgogICAgICAgICBjbGFzcyBJbWFnZURpZmZUZXN0UG9ydChUZXN0 UG9ydCk6CiAgICAgICAgICAgICBkZWYgZGlmZl9pbWFnZShzZWxmLCBleHBlY3RlZF9jb250ZW50 cywgYWN0dWFsX2NvbnRlbnRzLAo= 86697 2011-03-23 14:58:47 -0700 2011-03-23 15:35:07 -0700 Patch bug-56760-20110323145846.patch text/plain 6235 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODE3MjMKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwZjc2MDEwZDI0N2ZhZDE2ZmE5MzA5ZDBkY2EwMDA3ZTdh NzY0YzM0Li41MjdhYTQ1M2JkZDMxZTMzMDJiMjRmMTMxMzlmYzc5NTFkODgzYWI5IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTEtMDMtMjMgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbmV3LXJ1bi13ZWJr aXQtdGVzdHM6IHJ1biB0ZXN0cyBpbiBhc2NlbmRpbmcgYWxwaGFiZXRpY2FsIG9yZGVyIHBlcgor ICAgICAgICBkaXIuIFRoaXMgaXMgYSBzZWNvbmQgYXR0ZW1wdCBhdCB0aGUgZml4OyB0aGUgZmly c3QgYXR0ZW1wdCwgaW4gCisgICAgICAgIHI4MTU5NywgYnJva2UgdGhlIGJlaGF2aW9yIG9uIHRo ZSBvbGQtaW5saW5lIGFuZCBvbGQtdGhyZWFkcworICAgICAgICB3b3JrZXIgbW9kZWxzLgorCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Njc2MAorCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvZHVt cF9yZW5kZXJfdHJlZV90aHJlYWQucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9ydW5uZXIucHk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHk6CisKIDIw MTEtMDMtMjIgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9kdW1wX3JlbmRlcl90cmVlX3RocmVhZC5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1bXBfcmVu ZGVyX3RyZWVfdGhyZWFkLnB5CmluZGV4IDgzYjIyMTUwZTkzZWU2NzllNDQ4NjE1ODAzNzNkYWQx YTI1ZmIxYTQuLjZkNWNkYThlNmJhNWQyNjM5NTI1NDljMmJmYjQ4MGQ4Y2U0MmJjMjMgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdl L2R1bXBfcmVuZGVyX3RyZWVfdGhyZWFkLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1bXBfcmVuZGVyX3RyZWVfdGhyZWFkLnB5CkBA IC0yMTEsNyArMjExLDcgQEAgY2xhc3MgVGVzdFNoZWxsVGhyZWFkKHRocmVhZGluZy5UaHJlYWQs IHdvcmtlcl9taXhpbi5Xb3JrZXJNaXhpbik6CiAgICAgICAgICAgICAgICAgc2VsZi5fbnVtX3Rl c3RzX2luX2N1cnJlbnRfZ3JvdXAgPSBsZW4oc2VsZi5fZmlsZW5hbWVfbGlzdCkKICAgICAgICAg ICAgICAgICBzZWxmLl9jdXJyZW50X2dyb3VwX3N0YXJ0X3RpbWUgPSB0aW1lLnRpbWUoKQogCi0g ICAgICAgICAgICB0ZXN0X2lucHV0ID0gc2VsZi5fZmlsZW5hbWVfbGlzdC5wb3AoKQorICAgICAg ICAgICAgdGVzdF9pbnB1dCA9IHNlbGYuX2ZpbGVuYW1lX2xpc3QucG9wKDApCiAKICAgICAgICAg ICAgICMgV2UgaGF2ZSBhIHVybCwgcnVuIHRlc3RzLgogICAgICAgICAgICAgc2VsZi5fbnVtX3Rl c3RzICs9IDEKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2xheW91dF9wYWNrYWdlL3Rlc3RfcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9ydW5uZXIucHkKaW5kZXggMDg1OWY2OGVl NmFmYjI5NjIyNGNkOGYzMDU2NDEyYmJmMmZiNmFlMy4uNTY5ZGQ1MWM4MWRmNTFjMDY5YWZlYmRj N2ZiZmRiYzA5NTM3ZmIxOSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9ydW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9ydW5uZXIucHkKQEAg LTQ5NSwxMCArNDk1LDYgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAgICAgICAgICMgYSBQcmlv cml0eVF1ZXVlIHVudGlsIHdlIG1vdmUgdG8gUHl0aG9uIDIuNi4KICAgICAgICAgICAgIGZvciBk aXJlY3RvcnkgaW4gdGVzdHNfYnlfZGlyOgogICAgICAgICAgICAgICAgIHRlc3RfbGlzdCA9IHRl c3RzX2J5X2RpcltkaXJlY3RvcnldCi0gICAgICAgICAgICAgICAgIyBLZWVwIHRoZSB0ZXN0cyBp biBhbHBoYWJldGljYWwgb3JkZXIuCi0gICAgICAgICAgICAgICAgIyBGSVhNRTogUmVtb3ZlIG9u Y2UgdGVzdHMgYXJlIGZpeGVkIHNvIHRoZXkgY2FuIGJlIHJ1biBpbiBhbnkKLSAgICAgICAgICAg ICAgICAjIG9yZGVyLgotICAgICAgICAgICAgICAgIHRlc3RfbGlzdC5yZXZlcnNlKCkKICAgICAg ICAgICAgICAgICB0ZXN0X2xpc3RfdHVwbGUgPSAoZGlyZWN0b3J5LCB0ZXN0X2xpc3QpCiAgICAg ICAgICAgICAgICAgdGVzdF9saXN0cy5hcHBlbmQodGVzdF9saXN0X3R1cGxlKQogICAgICAgICAg ICAgdGVzdF9saXN0cy5zb3J0KGxhbWJkYSBhLCBiOiBjbXAobGVuKGJbMV0pLCBsZW4oYVsxXSkp KQpAQCAtNTA3LDcgKzUwMyw2IEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAgICAgICMgYnV0IGVh Y2ggaHR0cCB0ZXN0IHRha2VzIGEgdmVyeSBsb25nIHRpbWUgdG8gcnVuLCBzbyBzb3J0aW5nIGJ5 IHRoZQogICAgICAgICAjIG51bWJlciBvZiB0ZXN0cyBkb2Vzbid0IGFjY3VyYXRlbHkgY2FwdHVy ZSBob3cgbG9uZyB0aGV5IHRha2UgdG8gcnVuLgogICAgICAgICBpZiB0ZXN0c190b19odHRwX2xv Y2s6Ci0gICAgICAgICAgICB0ZXN0c190b19odHRwX2xvY2sucmV2ZXJzZSgpCiAgICAgICAgICAg ICB0ZXN0X2xpc3RzLmluc2VydCgwLCAoInRlc3RzX3RvX2h0dHBfbG9jayIsIHRlc3RzX3RvX2h0 dHBfbG9jaykpCiAKICAgICAgICAgcmV0dXJuIHRlc3RfbGlzdHMKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5weQppbmRleCA0YWViOGJiZWI2OTE0 YTJhYjBlYWM0YzhiY2Q3NmFhMTJmNGFjODliLi42ZGFkMzMyNTE1OTUzYjAyMTJlOGVjNjVkZGQ2 N2I2NjFlM2JmODZiIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L3Rlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC90ZXN0LnB5CkBAIC0xMjgsNiArMTI4LDcgQEAgZGVmIHVuaXRfdGVzdF9saXN0KCk6 CiAgICAgICAgICAgICAgIGFjdHVhbF9jaGVja3N1bT0ndGV4dC1pbWFnZS1jaGVja3N1bV9mYWls LWNoZWNrc3VtJykKICAgICB0ZXN0cy5hZGQoJ2ZhaWx1cmVzL3VuZXhwZWN0ZWQvdGltZW91dC5o dG1sJywgdGltZW91dD1UcnVlKQogICAgIHRlc3RzLmFkZCgnaHR0cC90ZXN0cy9wYXNzZXMvdGV4 dC5odG1sJykKKyAgICB0ZXN0cy5hZGQoJ2h0dHAvdGVzdHMvcGFzc2VzL2ltYWdlLmh0bWwnKQog ICAgIHRlc3RzLmFkZCgnaHR0cC90ZXN0cy9zc2wvdGV4dC5odG1sJykKICAgICB0ZXN0cy5hZGQo J3Bhc3Nlcy9lcnJvci5odG1sJywgZXJyb3I9J3N0dWZmIGdvaW5nIHRvIHN0ZGVycicpCiAgICAg dGVzdHMuYWRkKCdwYXNzZXMvaW1hZ2UuaHRtbCcpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVz dC5weQppbmRleCBmNzUzZjIzMWRlNmNiZGMyY2ZiYWYzZDc5NDlkZmEyNjI5ZmUyZTA3Li45MDQy NWU5YTRjODk4Y2JhZGJmNzZhYTQ4MDliOGI3NzRjMzIyYzU4IDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVz dHNfdW5pdHRlc3QucHkKQEAgLTczLDcgKzczLDcgQEAgZGVmIHBhcnNlX2FyZ3MoZXh0cmFfYXJn cz1Ob25lLCByZWNvcmRfcmVzdWx0cz1GYWxzZSwgdGVzdHNfaW5jbHVkZWQ9RmFsc2UsCiAgICAg ICAgIGFyZ3MuZXh0ZW5kKFsnLS1wbGF0Zm9ybScsICd0ZXN0J10pCiAgICAgaWYgbm90IHJlY29y ZF9yZXN1bHRzOgogICAgICAgICBhcmdzLmFwcGVuZCgnLS1uby1yZWNvcmQtcmVzdWx0cycpCi0g ICAgaWYgbm90ICctLWNoaWxkLXByb2Nlc3NlcycgaW4gZXh0cmFfYXJnczoKKyAgICBpZiBub3Qg Jy0tY2hpbGQtcHJvY2Vzc2VzJyBpbiBleHRyYV9hcmdzIGFuZCBub3QgJy0td29ya2VyLW1vZGVs JyBpbiBleHRyYV9hcmdzOgogICAgICAgICBhcmdzLmV4dGVuZChbJy0td29ya2VyLW1vZGVsJywg J29sZC1pbmxpbmUnXSkKICAgICBhcmdzLmV4dGVuZChleHRyYV9hcmdzKQogICAgIGlmIG5vdCB0 ZXN0c19pbmNsdWRlZDoKQEAgLTQ3MCw2ICs0NzAsMzIgQEAgY2xhc3MgTWFpblRlc3QodW5pdHRl c3QuVGVzdENhc2UpOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dGVzdHNfaW5jbHVkZWQ9VHJ1ZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh1c2VyLm9wZW5l ZF91cmxzLCBbJy90bXAvZm9vL3Jlc3VsdHMuaHRtbCddKQogCisgICAgIyBUaGVzZSBuZXh0IHRl c3RzIHRlc3QgdGhhdCB3ZSBydW4gdGhlIHRlc3RzIGluIGFzY2VuZGluZyBhbHBoYWJldGljYWwK KyAgICAjIG9yZGVyIHBlciBkaXJlY3RvcnkuIEhUVFAgdGVzdHMgYXJlIHNoYXJkZWQgc2VwYXJh dGVseSBmcm9tIG90aGVyIHRlc3RzLAorICAgICMgc28gd2UgaGF2ZSB0byB0ZXN0IGJvdGguCisg ICAgZGVmIGFzc2VydF9ydW5fb3JkZXIoc2VsZiwgd29ya2VyX21vZGVsLCBjaGlsZF9wcm9jZXNz ZXM9JzEnKToKKyAgICAgICAgdGVzdHNfcnVuID0gZ2V0X3Rlc3RzX3J1bihbJy0td29ya2VyLW1v ZGVsJywgd29ya2VyX21vZGVsLAorICAgICAgICAgICAgJy0tY2hpbGQtcHJvY2Vzc2VzJywgY2hp bGRfcHJvY2Vzc2VzLCAncGFzc2VzJ10sCisgICAgICAgICAgICB0ZXN0c19pbmNsdWRlZD1UcnVl LCBmbGF0dGVuX2JhdGNoZXM9VHJ1ZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHModGVzdHNf cnVuLCBzb3J0ZWQodGVzdHNfcnVuKSkKKworICAgICAgICB0ZXN0c19ydW4gPSBnZXRfdGVzdHNf cnVuKFsnLS13b3JrZXItbW9kZWwnLCB3b3JrZXJfbW9kZWwsCisgICAgICAgICAgICAnLS1jaGls ZC1wcm9jZXNzZXMnLCBjaGlsZF9wcm9jZXNzZXMsICdodHRwL3Rlc3RzL3Bhc3NlcyddLAorICAg ICAgICAgICAgdGVzdHNfaW5jbHVkZWQ9VHJ1ZSwgZmxhdHRlbl9iYXRjaGVzPVRydWUpCisgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHRlc3RzX3J1biwgc29ydGVkKHRlc3RzX3J1bikpCisKKyAg ICBkZWYgdGVzdF9ydW5fb3JkZXJfX2lubGluZShzZWxmKToKKyAgICAgICAgc2VsZi5hc3NlcnRf cnVuX29yZGVyKCdpbmxpbmUnKQorCisgICAgZGVmIHRlc3RfcnVuX29yZGVyX19vbGRfaW5saW5l KHNlbGYpOgorICAgICAgICBzZWxmLmFzc2VydF9ydW5fb3JkZXIoJ29sZC1pbmxpbmUnKQorCisg ICAgZGVmIHRlc3RfcnVuX29yZGVyX190aHJlYWRzKHNlbGYpOgorICAgICAgICBzZWxmLmFzc2Vy dF9ydW5fb3JkZXIoJ29sZC1pbmxpbmUnLCBjaGlsZF9wcm9jZXNzZXM9JzInKQorCisgICAgZGVm IHRlc3RfcnVuX29yZGVyX19vbGRfdGhyZWFkcyhzZWxmKToKKyAgICAgICAgc2VsZi5hc3NlcnRf cnVuX29yZGVyKCdvbGQtdGhyZWFkcycsIGNoaWxkX3Byb2Nlc3Nlcz0nMicpCisKICAgICBkZWYg dGVzdF90b2xlcmFuY2Uoc2VsZik6CiAgICAgICAgIGNsYXNzIEltYWdlRGlmZlRlc3RQb3J0KFRl c3RQb3J0KToKICAgICAgICAgICAgIGRlZiBkaWZmX2ltYWdlKHNlbGYsIGV4cGVjdGVkX2NvbnRl bnRzLCBhY3R1YWxfY29udGVudHMsCg==