84695 2012-04-24 03:14:44 -0700 [GTK] run-gtk-tests: Use a timeout per test instead of a global timeout 2012-04-26 07:44:33 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned gustavo pnormand oldest_to_newest 608504 0 cgarcia 2012-04-24 03:14:44 -0700 Using something like 10 secs per test, like run-api-tests does, would detect timed out test earlier. It would also allow to continue running other tests instead of aborting the whole script just because one test timed out. 608507 1 138528 cgarcia 2012-04-24 03:22:55 -0700 Created attachment 138528 Patch 608605 2 138528 pnormand 2012-04-24 06:35:43 -0700 Comment on attachment 138528 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138528&action=review Nice stuff! Looks good to me. > Tools/Scripts/run-gtk-tests:271 > + if timeout > 0: > + alarm(0) I'm not sure to understand this code. Can you clarify please? > Tools/Scripts/run-gtk-tests:307 > + timedout_tests = [] Hum, what about slow_tests? 608652 3 cgarcia 2012-04-24 07:43:28 -0700 (In reply to comment #2) > (From update of attachment 138528 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=138528&action=review > > Nice stuff! Looks good to me. > > > Tools/Scripts/run-gtk-tests:271 > > + if timeout > 0: > > + alarm(0) > > I'm not sure to understand this code. Can you clarify please? alarm(0) just resets the alarm so that no new alarms are scheduled. > > Tools/Scripts/run-gtk-tests:307 > > + timedout_tests = [] > > Hum, what about slow_tests? I don't think there's any test so slow, in any case we could use a value higher than 10, but I think 10 seconds per test is enough. 608680 4 pnormand 2012-04-24 08:16:47 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 138528 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=138528&action=review > > > > Nice stuff! Looks good to me. > > > > > Tools/Scripts/run-gtk-tests:271 > > > + if timeout > 0: > > > + alarm(0) > > > > I'm not sure to understand this code. Can you clarify please? > > alarm(0) just resets the alarm so that no new alarms are scheduled. > Ok. > > > Tools/Scripts/run-gtk-tests:307 > > > + timedout_tests = [] > > > > Hum, what about slow_tests? > > I don't think there's any test so slow, in any case we could use a value higher than 10, but I think 10 seconds per test is enough. I guess I meant the "timedout_tests" name wasn't great but that's only my opinion. I proposed slow_tests because I couldn't come up with a better name. 608684 5 cgarcia 2012-04-24 08:21:52 -0700 (In reply to comment #4) > > > > Tools/Scripts/run-gtk-tests:307 > > > > + timedout_tests = [] > > > > > > Hum, what about slow_tests? > > > > I don't think there's any test so slow, in any case we could use a value higher than 10, but I think 10 seconds per test is enough. > > I guess I meant the "timedout_tests" name wasn't great but that's only my opinion. I proposed slow_tests because I couldn't come up with a better name. Ah, you meant the name, sorry. Well, there are some tests that are slow, like BackForardList but they don't time out. 610462 6 cgarcia 2012-04-26 03:25:28 -0700 (In reply to comment #5) > (In reply to comment #4) > > > > > Tools/Scripts/run-gtk-tests:307 > > > > > + timedout_tests = [] > > > > > > > > Hum, what about slow_tests? > > > > > > I don't think there's any test so slow, in any case we could use a value higher than 10, but I think 10 seconds per test is enough. > > > > I guess I meant the "timedout_tests" name wasn't great but that's only my opinion. I proposed slow_tests because I couldn't come up with a better name. > > Ah, you meant the name, sorry. Well, there are some tests that are slow, like BackForardList but they don't time out. btw, it's called @testsTimedOut in run-api-tests, fwiw 610468 7 pnormand 2012-04-26 03:34:21 -0700 ok then what about timed_out_tests? 610495 8 138972 cgarcia 2012-04-26 04:13:11 -0700 Created attachment 138972 Updated patch Rebased to apply on current git master and renamed timedout_tests to timed_out_tests 610599 9 cgarcia 2012-04-26 07:44:33 -0700 Committed r115313: <http://trac.webkit.org/changeset/115313> 138528 2012-04-24 03:22:55 -0700 2012-04-26 04:13:11 -0700 Patch wk-run-gtk-tests-timeout.diff text/plain 6343 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3OTkz NWM1Li43MTY3Y2Y1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTItMDQtMjQgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIHJ1bi1ndGstdGVzdHM6IFVz ZSBhIHRpbWVvdXQgcGVyIHRlc3QgaW5zdGVhZCBvZiBhIGdsb2JhbCB0aW1lb3V0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDY5NQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0IGFsc28gYWRkcyBhIGNv bW1hbmQgbGluZSBvcHRpb24gdG8gYmUgYWJsZSB0byBwYXNzIGEgY3VzdG9tCisgICAgICAgIHRp bWVvdXQgdmFsdWUsIGluc3RlYWQgb2YgaGFyZC1jb2RpbmcgaXQuIFRoZSBkZWZhdWx0IHRpbWVv dXQgaXMgMTAKKyAgICAgICAgc2Vjb25kcyBpZiBubyBvdGhlciB2YWx1ZSBpcyBwYXNzZWQgdG8g dGhlIHNjcmlwdC4KKworICAgICAgICAqIFNjcmlwdHMvcnVuLWd0ay10ZXN0czoKKyAgICAgICAg KFRlc3RUaW1lb3V0KTogRXhjZXB0aW9uIHJhaXNlZCB3aGVuIGEgdGVzdCB0aW1lcyBvdXQuCisg ICAgICAgIChUZXN0UnVubmVyLl9nZXRfY2hpbGRfcGlkX2Zyb21fdGVzdF9vdXRwdXQpOiBIZWxw ZXIgZnVuY3Rpb24gdG8KKyAgICAgICAgZ2V0IHRoZSBwaWQgb2YgdGhlIHJ1bm5pbmcgdGVzdCBm cm9tIGd0ZXN0ZXIgb3V0cHV0LgorICAgICAgICAoVGVzdFJ1bm5lci5fa2lsbF9wcm9jZXNzKTog SGVscGVyIGZ1bnRpb24gb3Qga2lsbCBhIHByb2Nlc3MKKyAgICAgICAgaWdub3JpbmcgZXhjZXB0 aW9ucyBpZiB0aGUgcHJvY2VzcyBpcyBhbHJlYWR5IGRpZWQuCisgICAgICAgIChUZXN0UnVubmVy Ll9ydW5fdGVzdF9jb21tYW5kKTogUnVuIHRoZSB0ZXN0IGNvbW1hbmQgcmFpc2luZworICAgICAg ICBUZXN0VGltZW91dCBleGNlcHRpb24gaWYgdGhlIHRlc3QgZG9lc24ndCBmaW5pc2ggYmVmb3Jl IHRoZSBnaXZlbgorICAgICAgICB0aW1lb3V0IGluIHNlY29uZHMuCisgICAgICAgIChUZXN0UnVu bmVyLl9ydW5fdGVzdF9jb21tYW5kLmFsYXJtX2hhbmRsZXIpOiBBbGFybSBoYW5kbGVyIHRoYXQK KyAgICAgICAgcmFpc2VzIFRlc3RUaW1lb3V0IGV4Y2VwdGlvbi4KKyAgICAgICAgKFRlc3RSdW5u ZXIuX3J1bl90ZXN0KTogVXNlIF9ydW5fdGVzdF9jb21tYW5kKCkgdG8gcnVuIHRoZSB0ZXN0Lgor ICAgICAgICAoVGVzdFJ1bm5lci5ydW5fdGVzdHMpOiBBZGQgY3VycmVudCB0ZXN0IHRvIHRoZSBs aXN0IG9mIHRpbWVkIG91dAorICAgICAgICB0ZXN0IGlmIFRlc3RUaW1lb3V0IGV4Y2VwdGlvbiBp cyByYWlzZWQuIFNob3cgdGhlIGxpc3Qgb2YgdGltZWQKKyAgICAgICAgb3V0IHRlc3QgYXQgdGhl IGVuZC4KKwogMjAxMi0wNC0yMyAgRXJpcSBBdWd1c3RpbmUgIDxlYXVndXN0aUBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV0dXJuIHZhbHVlIGZyb20gZXhlY3V0ZWQgc2NyaXB0IGluIENocm9t aXVtLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzIGIvVG9vbHMvU2Ny aXB0cy9ydW4tZ3RrLXRlc3RzCmluZGV4IDc3NzY3ODguLjdmZTFkNTQgMTAwNzU1Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cworKysgYi9Ub29scy9TY3JpcHRzL3J1bi1ndGstdGVz dHMKQEAgLTIwLDEyICsyMCwxMSBAQAogaW1wb3J0IHN1YnByb2Nlc3MKIGltcG9ydCBvcwogaW1w b3J0IHN5cwotaW1wb3J0IHRpbWUKIGltcG9ydCBvcHRwYXJzZQoraW1wb3J0IHJlCitmcm9tIHNp Z25hbCBpbXBvcnQgYWxhcm0sIHNpZ25hbCwgU0lHQUxSTSwgU0lHS0lMTAogZnJvbSBnaS5yZXBv c2l0b3J5IGltcG9ydCBHaW8sIEdMaWIKIAotVElNRU9VVD0xODAgIyBzZWNvbmRzCi0KIGNsYXNz IFNraXBwZWRUZXN0OgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCB0ZXN0LCByZWFzb24sIGJ1Zz1O b25lLCB0ZXN0X2Nhc2VzPVtdKToKICAgICAgICAgc2VsZi50ZXN0ID0gdGVzdApAQCAtNDIsNiAr NDEsOSBAQCBjbGFzcyBTa2lwcGVkVGVzdDoKICAgICAgICAgICAgIHNraXBwZWRfdGVzdF9zdHIg Kz0gIihodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9JWQpIiAlIHNlbGYu YnVnCiAgICAgICAgIHJldHVybiBza2lwcGVkX3Rlc3Rfc3RyCiAKK2NsYXNzIFRlc3RUaW1lb3V0 KEV4Y2VwdGlvbik6CisgICAgcGFzcworCiBjbGFzcyBUZXN0UnVubmVyOgogCiAgICAgVEVTVF9E SVJTID0gWyAidW5pdHRlc3RzIiwgIldlYktpdDJBUElUZXN0cyIgXQpAQCAtMjM4LDYgKzI0MCw0 NiBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAgICAgICAjIFJ1biBvbmx5IHNraXBwZWQgdGVzdHMu CiAgICAgICAgIHJldHVybiBza2lwcGVkIGlzIG5vdCBOb25lCiAKKyAgICBkZWYgX2dldF9jaGls ZF9waWRfZnJvbV90ZXN0X291dHB1dChzZWxmLCBvdXRwdXQpOgorICAgICAgICBpZiBub3Qgb3V0 cHV0OgorICAgICAgICAgICAgcmV0dXJuIC0xCisgICAgICAgIG1hdGNoID0gcmUuc2VhcmNoKHIn XChwaWQ9KD9QPGNoaWxkX3BpZD5bMC05XSspXCknLCBvdXRwdXQpCisgICAgICAgIGlmIG5vdCBt YXRjaDoKKyAgICAgICAgICAgIHJldHVybiAtMQorICAgICAgICByZXR1cm4gaW50KG1hdGNoLmdy b3VwKCdjaGlsZF9waWQnKSkKKworICAgIGRlZiBfa2lsbF9wcm9jZXNzKHNlbGYsIHBpZCk6Cisg ICAgICAgIHRyeToKKyAgICAgICAgICAgIG9zLmtpbGwocGlkLCBTSUdLSUxMKQorICAgICAgICBl eGNlcHQgT1NFcnJvcjoKKyAgICAgICAgICAgICMgUHJvY2VzcyBhbHJlYWR5IGRpZWQuCisgICAg ICAgICAgICBwYXNzCisKKyAgICBkZWYgX3J1bl90ZXN0X2NvbW1hbmQoc2VsZiwgY29tbWFuZCwg dGltZW91dD0tMSk6CisgICAgICAgIGRlZiBhbGFybV9oYW5kbGVyKHNpZ251bSwgZnJhbWUpOgor ICAgICAgICAgICAgcmFpc2UgVGVzdFRpbWVvdXQKKworICAgICAgICBwID0gc2VsZi5fY3JlYXRl X3Byb2Nlc3MoY29tbWFuZCwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSwgZW52PXNlbGYuX3Rlc3Rf ZW52KQorICAgICAgICBpZiB0aW1lb3V0ID4gMDoKKyAgICAgICAgICAgIHNpZ25hbChTSUdBTFJN LCBhbGFybV9oYW5kbGVyKQorICAgICAgICAgICAgYWxhcm0odGltZW91dCkKKworICAgICAgICBz dGRvdXQgPSAiIgorICAgICAgICB0cnk6CisgICAgICAgICAgICBzdGRvdXQgPSBwLmNvbW11bmlj YXRlKClbMF0KKyAgICAgICAgICAgIGlmIHRpbWVvdXQgPiAwOgorICAgICAgICAgICAgICAgIGFs YXJtKDApCisgICAgICAgICAgICBzeXMuc3Rkb3V0LndyaXRlKHN0ZG91dCkKKyAgICAgICAgICAg IHN5cy5zdGRvdXQuZmx1c2goKQorICAgICAgICBleGNlcHQgVGVzdFRpbWVvdXQ6CisgICAgICAg ICAgICBzZWxmLl9raWxsX3Byb2Nlc3MocC5waWQpCisgICAgICAgICAgICBjaGlsZF9waWQgPSBz ZWxmLl9nZXRfY2hpbGRfcGlkX2Zyb21fdGVzdF9vdXRwdXQoc3Rkb3V0KQorICAgICAgICAgICAg aWYgY2hpbGRfcGlkID4gMDoKKyAgICAgICAgICAgICAgICBzZWxmLl9raWxsX3Byb2Nlc3MoY2hp bGRfcGlkKQorICAgICAgICAgICAgcmFpc2UKKworICAgICAgICByZXR1cm4gbm90IHAucmV0dXJu Y29kZQorCiAgICAgZGVmIF9ydW5fdGVzdChzZWxmLCB0ZXN0KToKICAgICAgICAgdGVzdGVyX2Nv bW1hbmQgPSBbJ2d0ZXN0ZXInXQogICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnZlcmJvc2U6CkBA IC0yNDYsNyArMjg4LDcgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAgICAgICAgIHRlc3Rlcl9j b21tYW5kLmV4dGVuZChbJy1zJywgdGVzdF9jYXNlXSkKICAgICAgICAgdGVzdGVyX2NvbW1hbmQu YXBwZW5kKHRlc3QpCiAKLSAgICAgICAgcmV0dXJuIG5vdCBzZWxmLl9jcmVhdGVfcHJvY2Vzcyh0 ZXN0ZXJfY29tbWFuZCwgZW52PXNlbGYuX3Rlc3RfZW52KS53YWl0KCkKKyAgICAgICAgcmV0dXJu IHNlbGYuX3J1bl90ZXN0X2NvbW1hbmQodGVzdGVyX2NvbW1hbmQsIHNlbGYuX29wdGlvbnMudGlt ZW91dCkKIAogICAgIGRlZiBydW5fdGVzdHMoc2VsZik6CiAgICAgICAgIGlmIG5vdCBzZWxmLl90 ZXN0czoKQEAgLTI2MiwxNyArMzA0LDE5IEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAgICAgIHNl bGYuX3Rlc3RzID0gW3Rlc3QgZm9yIHRlc3QgaW4gc2VsZi5fdGVzdHMgaWYgc2VsZi5fc2hvdWxk X3J1bl90ZXN0KHRlc3QpXQogCiAgICAgICAgIGZhaWxlZF90ZXN0cyA9IFtdCisgICAgICAgIHRp bWVkb3V0X3Rlc3RzID0gW10KICAgICAgICAgdHJ5OgotICAgICAgICAgICAgc3RhcnRfdGltZSA9 IHRpbWUudGltZSgpCiAgICAgICAgICAgICBmb3IgdGVzdCBpbiBzZWxmLl90ZXN0czoKLSAgICAg ICAgICAgICAgICBpZiBub3Qgc2VsZi5fcnVuX3Rlc3QodGVzdCk6Ci0gICAgICAgICAgICAgICAg ICAgIGZhaWxlZF90ZXN0cy5hcHBlbmQodGVzdCkKLQotICAgICAgICAgICAgICAgIGlmIHRpbWUu dGltZSgpIC0gc3RhcnRfdGltZSA+PSBUSU1FT1VUOgotICAgICAgICAgICAgICAgICAgICBzeXMu c3Rkb3V0LndyaXRlKCJUZXN0cyB0aW1lZCBvdXQgYWZ0ZXIgJWQgc2Vjb25kc1xuIiAlIFRJTUVP VVQpCisgICAgICAgICAgICAgICAgc3VjY2VzcyA9IFRydWUKKyAgICAgICAgICAgICAgICB0cnk6 CisgICAgICAgICAgICAgICAgICAgIHN1Y2Nlc3MgPSBzZWxmLl9ydW5fdGVzdCh0ZXN0KQorICAg ICAgICAgICAgICAgIGV4Y2VwdCBUZXN0VGltZW91dDoKKyAgICAgICAgICAgICAgICAgICAgc3lz LnN0ZG91dC53cml0ZSgiVEVTVDogJXM6IFRJTUVPVVRcbiIgJSB0ZXN0KQogICAgICAgICAgICAg ICAgICAgICBzeXMuc3Rkb3V0LmZsdXNoKCkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIDEK KyAgICAgICAgICAgICAgICAgICAgdGltZWRvdXRfdGVzdHMuYXBwZW5kKHRlc3QpCiAKKyAgICAg ICAgICAgICAgICBpZiBub3Qgc3VjY2VzczoKKyAgICAgICAgICAgICAgICAgICAgZmFpbGVkX3Rl c3RzLmFwcGVuZCh0ZXN0KQogICAgICAgICBmaW5hbGx5OgogICAgICAgICAgICAgc2VsZi5fdGVh cl9kb3duX3Rlc3RpbmdfZW52aXJvbm1lbnQoKQogCkBAIC0yODEsNiArMzI1LDExIEBAIGNsYXNz IFRlc3RSdW5uZXI6CiAgICAgICAgICAgICBzeXMuc3Rkb3V0LndyaXRlKCJUZXN0cyBmYWlsZWQ6 ICVzXG4iICUgIiwgIi5qb2luKG5hbWVzKSkKICAgICAgICAgICAgIHN5cy5zdGRvdXQuZmx1c2go KQogCisgICAgICAgIGlmIHRpbWVkb3V0X3Rlc3RzOgorICAgICAgICAgICAgbmFtZXMgPSBbdGVz dC5yZXBsYWNlKHNlbGYuX3Byb2dyYW1zX3BhdGgsICcnLCAxKSBmb3IgdGVzdCBpbiB0aW1lZG91 dF90ZXN0c10KKyAgICAgICAgICAgIHN5cy5zdGRvdXQud3JpdGUoIlRlc3RzIHRoYXQgdGltZWQg b3V0OiAlc1xuIiAlICIsICIuam9pbihuYW1lcykpCisgICAgICAgICAgICBzeXMuc3Rkb3V0LmZs dXNoKCkKKwogICAgICAgICBpZiBzZWxmLl9za2lwcGVkX3Rlc3RzIGFuZCBzZWxmLl9vcHRpb25z LnNraXBwZWRfYWN0aW9uID09ICdza2lwJzoKICAgICAgICAgICAgIHN5cy5zdGRvdXQud3JpdGUo IlRlc3RzIHNraXBwZWQ6XG4lc1xuIiAlICJcbiIuam9pbihbc3RyKHNraXBwZWQpIGZvciBza2lw cGVkIGluIHNlbGYuX3NraXBwZWRfdGVzdHNdKSkKICAgICAgICAgICAgIHN5cy5zdGRvdXQuZmx1 c2goKQpAQCAtMzA0LDYgKzM1Myw5IEBAIGlmIF9fbmFtZV9fID09ICJfX21haW5fXyI6CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNob2ljZXM9Wydza2lwJywgJ2lnbm9yZScsICdvbmx5 J10sIGRlZmF1bHQ9J3NraXAnLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtZXRhdmFy PSdza2lwfGlnbm9yZXxvbmx5JywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0n U3BlY2lmaWVzIGhvdyB0byB0cmVhdCB0aGUgc2tpcHBlZCB0ZXN0cycpCisgICAgb3B0aW9uX3Bh cnNlci5hZGRfb3B0aW9uKCctdCcsICctLXRpbWVvdXQnLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBhY3Rpb249J3N0b3JlJywgdHlwZT0naW50JywgZGVzdD0ndGltZW91dCcsIGRlZmF1 bHQ9MTAsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9J1RpbWUgaW4gc2Vjb25k cyB1bnRpbCBhIHRlc3QgdGltZXMgb3V0JykKICAgICBvcHRpb25zLCBhcmdzID0gb3B0aW9uX3Bh cnNlci5wYXJzZV9hcmdzKCkKIAogICAgIHN5cy5leGl0KFRlc3RSdW5uZXIob3B0aW9ucywgYXJn cykucnVuX3Rlc3RzKCkpCg== 138972 2012-04-26 04:13:11 -0700 2012-04-26 06:06:58 -0700 Updated patch wk-run-gtk-test-timeout2.diff text/plain 6946 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiZGI1 NDg0Li44ZmMxZDZkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMzMgQEAKIDIwMTItMDQtMjYgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCisgICAgICAgIFtHVEtdIHJ1bi1ndGstdGVzdHM6IFVz ZSBhIHRpbWVvdXQgcGVyIHRlc3QgaW5zdGVhZCBvZiBhIGdsb2JhbCB0aW1lb3V0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDY5NQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0IGFsc28gYWRkcyBhIGNv bW1hbmQgbGluZSBvcHRpb24gdG8gYmUgYWJsZSB0byBwYXNzIGEgY3VzdG9tCisgICAgICAgIHRp bWVvdXQgdmFsdWUsIGluc3RlYWQgb2YgaGFyZC1jb2RpbmcgaXQuIFRoZSBkZWZhdWx0IHRpbWVv dXQgaXMgMTAKKyAgICAgICAgc2Vjb25kcyBpZiBubyBvdGhlciB2YWx1ZSBpcyBwYXNzZWQgdG8g dGhlIHNjcmlwdC4KKworICAgICAgICAqIFNjcmlwdHMvcnVuLWd0ay10ZXN0czoKKyAgICAgICAg KFRlc3RUaW1lb3V0KTogRXhjZXB0aW9uIHJhaXNlZCB3aGVuIGEgdGVzdCB0aW1lcyBvdXQuCisg ICAgICAgIChUZXN0UnVubmVyLl9nZXRfY2hpbGRfcGlkX2Zyb21fdGVzdF9vdXRwdXQpOiBIZWxw ZXIgZnVuY3Rpb24gdG8KKyAgICAgICAgZ2V0IHRoZSBwaWQgb2YgdGhlIHJ1bm5pbmcgdGVzdCBm cm9tIGd0ZXN0ZXIgb3V0cHV0LgorICAgICAgICAoVGVzdFJ1bm5lci5fa2lsbF9wcm9jZXNzKTog SGVscGVyIGZ1bnRpb24gb3Qga2lsbCBhIHByb2Nlc3MKKyAgICAgICAgaWdub3JpbmcgZXhjZXB0 aW9ucyBpZiB0aGUgcHJvY2VzcyBpcyBhbHJlYWR5IGRpZWQuCisgICAgICAgIChUZXN0UnVubmVy Ll9ydW5fdGVzdF9jb21tYW5kKTogUnVuIHRoZSB0ZXN0IGNvbW1hbmQgcmFpc2luZworICAgICAg ICBUZXN0VGltZW91dCBleGNlcHRpb24gaWYgdGhlIHRlc3QgZG9lc24ndCBmaW5pc2ggYmVmb3Jl IHRoZSBnaXZlbgorICAgICAgICB0aW1lb3V0IGluIHNlY29uZHMuCisgICAgICAgIChUZXN0UnVu bmVyLl9ydW5fdGVzdF9jb21tYW5kLmFsYXJtX2hhbmRsZXIpOiBBbGFybSBoYW5kbGVyIHRoYXQK KyAgICAgICAgcmFpc2VzIFRlc3RUaW1lb3V0IGV4Y2VwdGlvbi4KKyAgICAgICAgKFRlc3RSdW5u ZXIuX3J1bl90ZXN0X2dsaWIpOiBVc2UgX3J1bl90ZXN0X2NvbW1hbmQoKSB0byBydW4gdGhlIHRl c3QuCisgICAgICAgIChUZXN0UnVubmVyLl9ydW5fdGVzdF9nb29nbGUpOiBEaXR0by4KKyAgICAg ICAgKFRlc3RSdW5uZXIucnVuX3Rlc3RzKTogQWRkIGN1cnJlbnQgdGVzdCB0byB0aGUgbGlzdCBv ZiB0aW1lZCBvdXQKKyAgICAgICAgdGVzdCBpZiBUZXN0VGltZW91dCBleGNlcHRpb24gaXMgcmFp c2VkLiBTaG93IHRoZSBsaXN0IG9mIHRpbWVkCisgICAgICAgIG91dCB0ZXN0IGF0IHRoZSBlbmQu CisKKzIwMTItMDQtMjYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCiAgICAgICAgIFtHVEtdIEFkZCBkb3dubG9hZHMgc3VwcG9ydCB0byBNaW5pQnJvd3Nlcgog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzM2NjIKIApk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9y dW4tZ3RrLXRlc3RzCmluZGV4IGNiYTQ4OWMuLmY0YjMxMGQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvcnVuLWd0ay10ZXN0cworKysgYi9Ub29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMKQEAg LTIwLDEyICsyMCwxMSBAQAogaW1wb3J0IHN1YnByb2Nlc3MKIGltcG9ydCBvcwogaW1wb3J0IHN5 cwotaW1wb3J0IHRpbWUKIGltcG9ydCBvcHRwYXJzZQoraW1wb3J0IHJlCitmcm9tIHNpZ25hbCBp bXBvcnQgYWxhcm0sIHNpZ25hbCwgU0lHQUxSTSwgU0lHS0lMTAogZnJvbSBnaS5yZXBvc2l0b3J5 IGltcG9ydCBHaW8sIEdMaWIKIAotVElNRU9VVD0xODAgIyBzZWNvbmRzCi0KIGNsYXNzIFNraXBw ZWRUZXN0OgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCB0ZXN0LCByZWFzb24sIGJ1Zz1Ob25lLCB0 ZXN0X2Nhc2VzPVtdKToKICAgICAgICAgc2VsZi50ZXN0ID0gdGVzdApAQCAtNDIsNiArNDEsOSBA QCBjbGFzcyBTa2lwcGVkVGVzdDoKICAgICAgICAgICAgIHNraXBwZWRfdGVzdF9zdHIgKz0gIiho dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9JWQpIiAlIHNlbGYuYnVnCiAg ICAgICAgIHJldHVybiBza2lwcGVkX3Rlc3Rfc3RyCiAKK2NsYXNzIFRlc3RUaW1lb3V0KEV4Y2Vw dGlvbik6CisgICAgcGFzcworCiBjbGFzcyBUZXN0UnVubmVyOgogCiAgICAgVEVTVF9ESVJTID0g WyAidW5pdHRlc3RzIiwgIldlYktpdDJBUElUZXN0cyIsICJUZXN0V2ViS2l0QVBJL1dURiIgXQpA QCAtMjQyLDYgKzI0NCw0NiBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAgICAgICAjIFJ1biBvbmx5 IHNraXBwZWQgdGVzdHMuCiAgICAgICAgIHJldHVybiBza2lwcGVkIGlzIG5vdCBOb25lCiAKKyAg ICBkZWYgX2dldF9jaGlsZF9waWRfZnJvbV90ZXN0X291dHB1dChzZWxmLCBvdXRwdXQpOgorICAg ICAgICBpZiBub3Qgb3V0cHV0OgorICAgICAgICAgICAgcmV0dXJuIC0xCisgICAgICAgIG1hdGNo ID0gcmUuc2VhcmNoKHInXChwaWQ9KD9QPGNoaWxkX3BpZD5bMC05XSspXCknLCBvdXRwdXQpCisg ICAgICAgIGlmIG5vdCBtYXRjaDoKKyAgICAgICAgICAgIHJldHVybiAtMQorICAgICAgICByZXR1 cm4gaW50KG1hdGNoLmdyb3VwKCdjaGlsZF9waWQnKSkKKworICAgIGRlZiBfa2lsbF9wcm9jZXNz KHNlbGYsIHBpZCk6CisgICAgICAgIHRyeToKKyAgICAgICAgICAgIG9zLmtpbGwocGlkLCBTSUdL SUxMKQorICAgICAgICBleGNlcHQgT1NFcnJvcjoKKyAgICAgICAgICAgICMgUHJvY2VzcyBhbHJl YWR5IGRpZWQuCisgICAgICAgICAgICBwYXNzCisKKyAgICBkZWYgX3J1bl90ZXN0X2NvbW1hbmQo c2VsZiwgY29tbWFuZCwgdGltZW91dD0tMSk6CisgICAgICAgIGRlZiBhbGFybV9oYW5kbGVyKHNp Z251bSwgZnJhbWUpOgorICAgICAgICAgICAgcmFpc2UgVGVzdFRpbWVvdXQKKworICAgICAgICBw ID0gc2VsZi5fY3JlYXRlX3Byb2Nlc3MoY29tbWFuZCwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSwg ZW52PXNlbGYuX3Rlc3RfZW52KQorICAgICAgICBpZiB0aW1lb3V0ID4gMDoKKyAgICAgICAgICAg IHNpZ25hbChTSUdBTFJNLCBhbGFybV9oYW5kbGVyKQorICAgICAgICAgICAgYWxhcm0odGltZW91 dCkKKworICAgICAgICBzdGRvdXQgPSAiIgorICAgICAgICB0cnk6CisgICAgICAgICAgICBzdGRv dXQgPSBwLmNvbW11bmljYXRlKClbMF0KKyAgICAgICAgICAgIGlmIHRpbWVvdXQgPiAwOgorICAg ICAgICAgICAgICAgIGFsYXJtKDApCisgICAgICAgICAgICBzeXMuc3Rkb3V0LndyaXRlKHN0ZG91 dCkKKyAgICAgICAgICAgIHN5cy5zdGRvdXQuZmx1c2goKQorICAgICAgICBleGNlcHQgVGVzdFRp bWVvdXQ6CisgICAgICAgICAgICBzZWxmLl9raWxsX3Byb2Nlc3MocC5waWQpCisgICAgICAgICAg ICBjaGlsZF9waWQgPSBzZWxmLl9nZXRfY2hpbGRfcGlkX2Zyb21fdGVzdF9vdXRwdXQoc3Rkb3V0 KQorICAgICAgICAgICAgaWYgY2hpbGRfcGlkID4gMDoKKyAgICAgICAgICAgICAgICBzZWxmLl9r aWxsX3Byb2Nlc3MoY2hpbGRfcGlkKQorICAgICAgICAgICAgcmFpc2UKKworICAgICAgICByZXR1 cm4gbm90IHAucmV0dXJuY29kZQorCiAgICAgZGVmIF9ydW5fdGVzdF9nbGliKHNlbGYsIHRlc3Qp OgogICAgICAgICB0ZXN0ZXJfY29tbWFuZCA9IFsnZ3Rlc3RlciddCiAgICAgICAgIGlmIHNlbGYu X29wdGlvbnMudmVyYm9zZToKQEAgLTI1MCw3ICsyOTIsNyBAQCBjbGFzcyBUZXN0UnVubmVyOgog ICAgICAgICAgICAgdGVzdGVyX2NvbW1hbmQuZXh0ZW5kKFsnLXMnLCB0ZXN0X2Nhc2VdKQogICAg ICAgICB0ZXN0ZXJfY29tbWFuZC5hcHBlbmQodGVzdCkKIAotICAgICAgICByZXR1cm4gbm90IHNl bGYuX2NyZWF0ZV9wcm9jZXNzKHRlc3Rlcl9jb21tYW5kLCBlbnY9c2VsZi5fdGVzdF9lbnYpLndh aXQoKQorICAgICAgICByZXR1cm4gc2VsZi5fcnVuX3Rlc3RfY29tbWFuZCh0ZXN0ZXJfY29tbWFu ZCwgc2VsZi5fb3B0aW9ucy50aW1lb3V0KQogCiAgICAgZGVmIF9ydW5fdGVzdF9nb29nbGUoc2Vs ZiwgdGVzdCk6CiAgICAgICAgIHRlc3Rlcl9jb21tYW5kID0gW3Rlc3QsICItLWd0ZXN0X3Rocm93 X29uX2ZhaWx1cmUiXQpAQCAtMjU4LDcgKzMwMCw3IEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAg ICAgIGlmIHNraXBwZWRfdGVzdHNfY2FzZXM6CiAgICAgICAgICAgICB0ZXN0ZXJfY29tbWFuZC5h cHBlbmQoIi0tZ3Rlc3RfZmlsdGVyPS0lcyIgJSAiOiIuam9pbihza2lwcGVkX3Rlc3RzX2Nhc2Vz KSkKIAotICAgICAgICByZXR1cm4gbm90IHNlbGYuX2NyZWF0ZV9wcm9jZXNzKHRlc3Rlcl9jb21t YW5kLCBlbnY9c2VsZi5fdGVzdF9lbnYpLndhaXQoKQorICAgICAgICByZXR1cm4gc2VsZi5fcnVu X3Rlc3RfY29tbWFuZCh0ZXN0ZXJfY29tbWFuZCwgc2VsZi5fb3B0aW9ucy50aW1lb3V0KQogCiAg ICAgZGVmIF9ydW5fdGVzdChzZWxmLCB0ZXN0KToKICAgICAgICAgaWYgInVuaXR0ZXN0cyIgaW4g dGVzdCBvciAiV2ViS2l0MkFQSVRlc3RzIiBpbiB0ZXN0OgpAQCAtMjgzLDE3ICszMjUsMTkgQEAg Y2xhc3MgVGVzdFJ1bm5lcjoKICAgICAgICAgc2VsZi5fdGVzdHMgPSBbdGVzdCBmb3IgdGVzdCBp biBzZWxmLl90ZXN0cyBpZiBzZWxmLl9zaG91bGRfcnVuX3Rlc3QodGVzdCldCiAKICAgICAgICAg ZmFpbGVkX3Rlc3RzID0gW10KKyAgICAgICAgdGltZWRfb3V0X3Rlc3RzID0gW10KICAgICAgICAg dHJ5OgotICAgICAgICAgICAgc3RhcnRfdGltZSA9IHRpbWUudGltZSgpCiAgICAgICAgICAgICBm b3IgdGVzdCBpbiBzZWxmLl90ZXN0czoKLSAgICAgICAgICAgICAgICBpZiBub3Qgc2VsZi5fcnVu X3Rlc3QodGVzdCk6Ci0gICAgICAgICAgICAgICAgICAgIGZhaWxlZF90ZXN0cy5hcHBlbmQodGVz dCkKLQotICAgICAgICAgICAgICAgIGlmIHRpbWUudGltZSgpIC0gc3RhcnRfdGltZSA+PSBUSU1F T1VUOgotICAgICAgICAgICAgICAgICAgICBzeXMuc3Rkb3V0LndyaXRlKCJUZXN0cyB0aW1lZCBv dXQgYWZ0ZXIgJWQgc2Vjb25kc1xuIiAlIFRJTUVPVVQpCisgICAgICAgICAgICAgICAgc3VjY2Vz cyA9IFRydWUKKyAgICAgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAgICAgICAgIHN1Y2Nl c3MgPSBzZWxmLl9ydW5fdGVzdCh0ZXN0KQorICAgICAgICAgICAgICAgIGV4Y2VwdCBUZXN0VGlt ZW91dDoKKyAgICAgICAgICAgICAgICAgICAgc3lzLnN0ZG91dC53cml0ZSgiVEVTVDogJXM6IFRJ TUVPVVRcbiIgJSB0ZXN0KQogICAgICAgICAgICAgICAgICAgICBzeXMuc3Rkb3V0LmZsdXNoKCkK LSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIDEKKyAgICAgICAgICAgICAgICAgICAgdGltZWRf b3V0X3Rlc3RzLmFwcGVuZCh0ZXN0KQogCisgICAgICAgICAgICAgICAgaWYgbm90IHN1Y2Nlc3M6 CisgICAgICAgICAgICAgICAgICAgIGZhaWxlZF90ZXN0cy5hcHBlbmQodGVzdCkKICAgICAgICAg ZmluYWxseToKICAgICAgICAgICAgIHNlbGYuX3RlYXJfZG93bl90ZXN0aW5nX2Vudmlyb25tZW50 KCkKIApAQCAtMzAyLDYgKzM0NiwxMSBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAgICAgICAgICAg c3lzLnN0ZG91dC53cml0ZSgiVGVzdHMgZmFpbGVkOiAlc1xuIiAlICIsICIuam9pbihuYW1lcykp CiAgICAgICAgICAgICBzeXMuc3Rkb3V0LmZsdXNoKCkKIAorICAgICAgICBpZiB0aW1lZF9vdXRf dGVzdHM6CisgICAgICAgICAgICBuYW1lcyA9IFt0ZXN0LnJlcGxhY2Uoc2VsZi5fcHJvZ3JhbXNf cGF0aCwgJycsIDEpIGZvciB0ZXN0IGluIHRpbWVkX291dF90ZXN0c10KKyAgICAgICAgICAgIHN5 cy5zdGRvdXQud3JpdGUoIlRlc3RzIHRoYXQgdGltZWQgb3V0OiAlc1xuIiAlICIsICIuam9pbihu YW1lcykpCisgICAgICAgICAgICBzeXMuc3Rkb3V0LmZsdXNoKCkKKwogICAgICAgICBpZiBzZWxm Ll9za2lwcGVkX3Rlc3RzIGFuZCBzZWxmLl9vcHRpb25zLnNraXBwZWRfYWN0aW9uID09ICdza2lw JzoKICAgICAgICAgICAgIHN5cy5zdGRvdXQud3JpdGUoIlRlc3RzIHNraXBwZWQ6XG4lc1xuIiAl ICJcbiIuam9pbihbc3RyKHNraXBwZWQpIGZvciBza2lwcGVkIGluIHNlbGYuX3NraXBwZWRfdGVz dHNdKSkKICAgICAgICAgICAgIHN5cy5zdGRvdXQuZmx1c2goKQpAQCAtMzI1LDYgKzM3NCw5IEBA IGlmIF9fbmFtZV9fID09ICJfX21haW5fXyI6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNob2ljZXM9Wydza2lwJywgJ2lnbm9yZScsICdvbmx5J10sIGRlZmF1bHQ9J3NraXAnLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBtZXRhdmFyPSdza2lwfGlnbm9yZXxvbmx5JywKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0nU3BlY2lmaWVzIGhvdyB0byB0cmVhdCB0 aGUgc2tpcHBlZCB0ZXN0cycpCisgICAgb3B0aW9uX3BhcnNlci5hZGRfb3B0aW9uKCctdCcsICct LXRpbWVvdXQnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhY3Rpb249J3N0b3JlJywg dHlwZT0naW50JywgZGVzdD0ndGltZW91dCcsIGRlZmF1bHQ9MTAsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGhlbHA9J1RpbWUgaW4gc2Vjb25kcyB1bnRpbCBhIHRlc3QgdGltZXMgb3V0 JykKICAgICBvcHRpb25zLCBhcmdzID0gb3B0aW9uX3BhcnNlci5wYXJzZV9hcmdzKCkKIAogICAg IHN5cy5leGl0KFRlc3RSdW5uZXIob3B0aW9ucywgYXJncykucnVuX3Rlc3RzKCkpCg==