38011 2010-04-22 16:05:01 -0700 Add code to help debug new-run-webkit-test hangs on the Chromium bots 2010-04-22 16:48:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 37987 1 eric webkit-unassigned abarth dpranke jamesr oldest_to_newest 216129 0 eric 2010-04-22 16:05:01 -0700 Add code to help debug new-run-webkit-test hangs on the Chromium bots 216131 1 54102 eric 2010-04-22 16:07:36 -0700 Created attachment 54102 Add code for debugging on the bots 216133 2 54102 abarth 2010-04-22 16:09:32 -0700 Comment on attachment 54102 Add code for debugging on the bots You haz no tests. 216135 3 54102 eric 2010-04-22 16:11:36 -0700 Comment on attachment 54102 Add code for debugging on the bots Too bad. 216138 4 54102 eric 2010-04-22 16:13:16 -0700 Comment on attachment 54102 Add code for debugging on the bots There is some question as to if we even want this code added in. Then there is question as to how one would go about testing his. We could stub out sys._current_frames(), maybe? Or we could have the test data depend on the implementation of python/unitest.py which seems like a bad idea. 216140 5 eric 2010-04-22 16:14:51 -0700 If this were C++ I would wrap it in some #ifdef with some big THIS_IS_A_HACK. But maybe we do want this code long term? Certainly we don't want it dumping every 60s I don't think. I would love if we could repro the failure locally, that woudl be better than checking in hacks like this just so we can debug on our bots. 216143 6 54102 ojan 2010-04-22 16:18:56 -0700 Comment on attachment 54102 Add code for debugging on the bots WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:648 + # through which tests we wait on. I don't understand this last sentence. WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:656 + # The individual threads already call update_summary. This is not true. The individual threads only call update_summary if we're running in single threaded mode. The individual threads do update the shared results_queue object that update_summary uses though. 216144 7 eric 2010-04-22 16:20:51 -0700 Wow. you're right. test_runner is None otherwise. Crazy. 216148 8 54106 eric 2010-04-22 16:27:50 -0700 Created attachment 54106 Update comments and ChangeLog 216154 9 54106 abarth 2010-04-22 16:41:06 -0700 Comment on attachment 54106 Update comments and ChangeLog This code is super mysterious to me so this is more of a rubber stamp. Also, i'd like to see it removed as soon as reasonable. 216155 10 eric 2010-04-22 16:45:36 -0700 Agreed. 216156 11 eric 2010-04-22 16:48:08 -0700 Committed r58128: <http://trac.webkit.org/changeset/58128> 54102 2010-04-22 16:07:36 -0700 2010-04-22 16:27:45 -0700 Add code for debugging on the bots bug-38011-20100422160735.patch text/plain 5642 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjZmE3ZjBkLi45NTNhMzE0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDQt MjIgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBjb2RlIHRvIGhlbHAgZGVidWcgbmV3LXJ1 bi13ZWJraXQtdGVzdCBoYW5ncyBvbiB0aGUgQ2hyb21pdW0gYm90cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzgwMTEKKworICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHk6CisgICAgICAgICAt IEFkZCBfZHVtcF90aHJlYWRfc3RhdGVzIGFuZCBfZHVtcF90aHJlYWRfc3RhdGVzX2lmX25lY2Vz c2FyeQorICAgICAgICAgICB0byBoYXZlIG91ciBtYWluIHRocmVhZCBkdW1wIHRoZSBzdGF0ZXMg b2YgYWxsIHRocmVhZHMgZXZlcnkKKyAgICAgICAgICAgNjAgc2Vjb25kcyB3aGVuIHJ1bm5pbmcg aW4gdmVyYm9zZSBtb2RlLgorICAgICAgICAgLSBCZXR0ZXIgZG9jdW1lbnQgd2hhdCBpcyBnb2lu ZyBvbiBpbiBvdXIgbWFpbiBsb29wLgorCiAyMDEwLTA0LTIyICBTYW0gV2VpbmlnICA8c2FtQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxzc29uLgpkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtp dF90ZXN0cy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1 bl93ZWJraXRfdGVzdHMucHkKaW5kZXggZGViNTI5Ny4uMWZmODI2MyAxMDA3NTUKLS0tIGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5w eQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Vi a2l0X3Rlc3RzLnB5CkBAIC0yMzgsNiArMjM4LDkgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKIAogICAg ICAgICBzZWxmLl9yZXRyaWVzID0gMAogCisgICAgICAgICMgSGFjayBmb3IgZHVtcGluZyB0aHJl YWRzIG9uIHRoZSBib3RzCisgICAgICAgIHNlbGYuX2xhc3RfdGhyZWFkX2R1bXAgPSBOb25lCisK ICAgICBkZWYgX19kZWxfXyhzZWxmKToKICAgICAgICAgX2xvZy5kZWJ1ZygiZmx1c2hpbmcgc3Rk b3V0IikKICAgICAgICAgc3lzLnN0ZG91dC5mbHVzaCgpCkBAIC01ODMsNiArNTg2LDI5IEBAIGNs YXNzIFRlc3RSdW5uZXI6CiAgICAgICAgICIiIlJldHVybnMgd2hldGhlciB3ZSBzaG91bGQgcnVu IGFsbCB0aGUgdGVzdHMgaW4gdGhlIG1haW4gdGhyZWFkLiIiIgogICAgICAgICByZXR1cm4gaW50 KHNlbGYuX29wdGlvbnMuY2hpbGRfcHJvY2Vzc2VzKSA9PSAxCiAKKyAgICBkZWYgX2R1bXBfdGhy ZWFkX3N0YXRlcyhzZWxmKToKKyAgICAgICAgZm9yIHRocmVhZF9pZCwgc3RhY2sgaW4gc3lzLl9j dXJyZW50X2ZyYW1lcygpLml0ZW1zKCk6CisgICAgICAgICAgICAjIEZJWE1FOiBQeXRob24gMi42 IGhhcyB0aHJlYWQuaWRlbnQgd2hpY2ggd2UgY291bGQKKyAgICAgICAgICAgICMgdXNlIHRvIG1h cCBmcm9tIHRocmVhZF9pZCBiYWNrIHRvIHRocmVhZC5uYW1lCisgICAgICAgICAgICBwcmludCAi XG4jIFRocmVhZDogJWQiICUgdGhyZWFkX2lkCisgICAgICAgICAgICBmb3IgZmlsZW5hbWUsIGxp bmVubywgbmFtZSwgbGluZSBpbiB0cmFjZWJhY2suZXh0cmFjdF9zdGFjayhzdGFjayk6CisgICAg ICAgICAgICAgICAgcHJpbnQgJ0ZpbGU6ICIlcyIsIGxpbmUgJWQsIGluICVzJyAlIChmaWxlbmFt ZSwgbGluZW5vLCBuYW1lKQorICAgICAgICAgICAgICAgIGlmIGxpbmU6CisgICAgICAgICAgICAg ICAgICAgIHByaW50ICIgICVzIiAlIChsaW5lLnN0cmlwKCkpCisKKyAgICBkZWYgX2R1bXBfdGhy ZWFkX3N0YXRlc19pZl9uZWNlc3Nhcnkoc2VsZik6CisgICAgICAgICMgSEFDSzogRHVtcCB0aHJl YWQgc3RhdGVzIGV2ZXJ5IG1pbnV0ZSB0byBmaWd1cmUgb3V0IHdoYXQncworICAgICAgICAjIGhh bmdpbmcgb24gdGhlIGJvdHMuCisgICAgICAgIGlmIG5vdCBzZWxmLl9vcHRpb25zLnZlcmJvc2U6 CisgICAgICAgICAgICByZXR1cm4KKyAgICAgICAgZHVtcF90aHJlYWRzX2V2ZXJ5ID0gNjAgICMg RHVtcCBldmVyeSBtaW51dGUKKyAgICAgICAgaWYgbm90IHNlbGYuX2xhc3RfdGhyZWFkX2R1bXA6 CisgICAgICAgICAgICBzZWxmLl9sYXN0X3RocmVhZF9kdW1wID0gdGltZS50aW1lKCkKKyAgICAg ICAgdGltZV9zaW5jZV9sYXN0X2R1bXAgPSB0aW1lLnRpbWUoKSAtIHNlbGYuX2xhc3RfdGhyZWFk X2R1bXAKKyAgICAgICAgaWYgIHRpbWVfc2luY2VfbGFzdF9kdW1wID4gZHVtcF90aHJlYWRzX2V2 ZXJ5OgorICAgICAgICAgICAgc2VsZi5fZHVtcF90aHJlYWRfc3RhdGVzKCkKKyAgICAgICAgICAg IHNlbGYuX2xhc3RfdGhyZWFkX2R1bXAgPSB0aW1lLnRpbWUoKQorCiAgICAgZGVmIF9ydW5fdGVz dHMoc2VsZiwgZmlsZV9saXN0LCByZXN1bHRfc3VtbWFyeSk6CiAgICAgICAgICIiIlJ1bnMgdGhl IHRlc3RzIGluIHRoZSBmaWxlX2xpc3QuCiAKQEAgLTU5Nyw2ICs2MjMsNyBAQCBjbGFzcyBUZXN0 UnVubmVyOgogICAgICAgICAgICAgICBpbiB0aGUgZm9ybSB7ZmlsZW5hbWU6ZmlsZW5hbWUsIHRl c3RfcnVuX3RpbWU6dGVzdF9ydW5fdGltZX0KICAgICAgICAgICAgIHJlc3VsdF9zdW1tYXJ5OiBz dW1tYXJ5IG9iamVjdCB0byBwb3B1bGF0ZSB3aXRoIHRoZSByZXN1bHRzCiAgICAgICAgICIiIgor ICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGQgdXNlIHdlYmtpdHB5LnRvb2wuZ3JhbW1hci5wbHVy YWxpemUgaGVyZS4KICAgICAgICAgcGx1cmFsID0gIiIKICAgICAgICAgaWYgc2VsZi5fb3B0aW9u cy5jaGlsZF9wcm9jZXNzZXMgPiAxOgogICAgICAgICAgICAgcGx1cmFsID0gInMiCkBAIC02MTIs MjEgKzYzOSwyOSBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAgICAgICBpbmRpdmlkdWFsX3Rlc3Rf dGltaW5ncyA9IFtdCiAgICAgICAgIHRocmVhZF90aW1pbmdzID0gW10KICAgICAgICAgdHJ5Ogor ICAgICAgICAgICAgIyBMb29wIHRocm91Z2ggYWxsIHRoZSB0aHJlYWRzIHdhaXRpbmcgZm9yIHRo ZW0gdG8gZmluaXNoLgogICAgICAgICAgICAgZm9yIHRocmVhZCBpbiB0aHJlYWRzOgorICAgICAg ICAgICAgICAgICMgRklYTUU6IFdlJ2xsIGVuZCB1cCB3YWl0aW5nIG9uIHRoZSBmaXJzdCB0aHJl YWQgdGhlIHdob2xlCisgICAgICAgICAgICAgICAgIyB0aW1lLiAgVGhhdCBtZWFucyB3ZSB3b24n dCBub3RpY2UgZXhjZXB0aW9ucyBvbiBvdGhlcgorICAgICAgICAgICAgICAgICMgdGhyZWFkcyB1 bnRpbCB0aGUgZmlyc3Qgb25lIGV4aXRzLgorICAgICAgICAgICAgICAgICMgV2Ugc2hvdWxkIGlu dmVydCB0aGlzIGxvb3Agc28gdGhhdCB3ZSBjeWNsZQorICAgICAgICAgICAgICAgICMgdGhyb3Vn aCB3aGljaCB0ZXN0cyB3ZSB3YWl0IG9uLgogICAgICAgICAgICAgICAgIHdoaWxlIHRocmVhZC5p c0FsaXZlKCk6Ci0gICAgICAgICAgICAgICAgICAgICMgTGV0IGl0IHRpbWVvdXQgb2NjYXNpb25h bGx5IHNvIGl0IGNhbiBub3RpY2UgYQotICAgICAgICAgICAgICAgICAgICAjIEtleWJvYXJkSW50 ZXJydXB0LiBBY3R1YWxseSwgdGhlIHRpbWVvdXQgZG9lc24ndAotICAgICAgICAgICAgICAgICAg ICAjIHJlYWxseSBtYXR0ZXI6IGFwcGFyZW50bHkgaXQgc3VmZmljZXMgdG8gbm90IHVzZQotICAg ICAgICAgICAgICAgICAgICAjIGFuIGluZGVmaW5pdGUgYmxvY2tpbmcgam9pbiBmb3IgaXQgdG8K LSAgICAgICAgICAgICAgICAgICAgIyBiZSBpbnRlcnJ1cHRpYmxlIGJ5IEtleWJvYXJkSW50ZXJy dXB0LgorICAgICAgICAgICAgICAgICAgICAjIFN1cHBvc2VkbHkgd2UgbmVlZCB0byBhIHRpbWVv dXQgaGVyZQorICAgICAgICAgICAgICAgICAgICAjIGluIG9yZGVyIHRvIG5vdGljZSBLZXlib2Fy ZEludGVydXB0LgogICAgICAgICAgICAgICAgICAgICB0aHJlYWQuam9pbigwLjEpCisgICAgICAg ICAgICAgICAgICAgICMgSEFDSzogVXNlZCBmb3IgZGVidWdnaW5nIHRocmVhZHMgb24gdGhlIGJv dHMuCisgICAgICAgICAgICAgICAgICAgIHNlbGYuX2R1bXBfdGhyZWFkX3N0YXRlc19pZl9uZWNl c3NhcnkoKQorICAgICAgICAgICAgICAgICAgICAjIEZJWE1FOiBXaHkgZG8gd2UgdXBkYXRlIGhl cmU/CisgICAgICAgICAgICAgICAgICAgICMgVGhlIGluZGl2aWR1YWwgdGhyZWFkcyBhbHJlYWR5 IGNhbGwgdXBkYXRlX3N1bW1hcnkuCiAgICAgICAgICAgICAgICAgICAgIHNlbGYudXBkYXRlX3N1 bW1hcnkocmVzdWx0X3N1bW1hcnkpCisKKyAgICAgICAgICAgICAgICAjIFRoaXMgdGhyZWFkIGlz IGRvbmUsIHNhdmUgb2ZmIHRoZSB0aW1pbmcgaW5mb3JtYXRpb24uCiAgICAgICAgICAgICAgICAg dGhyZWFkX3RpbWluZ3MuYXBwZW5kKHsnbmFtZSc6IHRocmVhZC5nZXROYW1lKCksCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnbnVtX3Rlc3RzJzogdGhyZWFkLmdldF9u dW1fdGVzdHMoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICd0b3Rh bF90aW1lJzogdGhyZWFkLmdldF90b3RhbF90aW1lKCl9KQogICAgICAgICAgICAgICAgIHRlc3Rf dGltaW5ncy51cGRhdGUodGhyZWFkLmdldF9kaXJlY3RvcnlfdGltaW5nX3N0YXRzKCkpCi0gICAg ICAgICAgICAgICAgaW5kaXZpZHVhbF90ZXN0X3RpbWluZ3MuZXh0ZW5kKAotICAgICAgICAgICAg ICAgICAgICB0aHJlYWQuZ2V0X3Rlc3RfcmVzdWx0cygpKQorICAgICAgICAgICAgICAgIGluZGl2 aWR1YWxfdGVzdF90aW1pbmdzLmV4dGVuZCh0aHJlYWQuZ2V0X3Rlc3RfcmVzdWx0cygpKQogICAg ICAgICBleGNlcHQgS2V5Ym9hcmRJbnRlcnJ1cHQ6CiAgICAgICAgICAgICBmb3IgdGhyZWFkIGlu IHRocmVhZHM6CiAgICAgICAgICAgICAgICAgdGhyZWFkLmNhbmNlbCgpCkBAIC02NDAsNyArNjc1 LDkgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAgICAgICAgICAgICAjIHdvdWxkIGJlIGFzc3Vt ZWQgdG8gaGF2ZSBwYXNzZWQuCiAgICAgICAgICAgICAgICAgcmFpc2UgZXhjZXB0aW9uX2luZm9b MF0sIGV4Y2VwdGlvbl9pbmZvWzFdLCBleGNlcHRpb25faW5mb1syXQogCi0gICAgICAgICMgTWFr ZSBzdXJlIHdlIHBpY2sgdXAgYW55IHJlbWFpbmluZyB0ZXN0cy4KKyAgICAgICAgIyBGSVhNRTog VGhpcyB1cGRhdGVfc3VtbWFyeSBjYWxsIHNlZW1zIHVuZWNlc3NhcnkuCisgICAgICAgICMgQ2Fs bHMgYXJlIGFscmVhZHkgbWFkZSByaWdodCBhZnRlciBqb2luKCkgYWJvdmUsCisgICAgICAgICMg YXMgd2VsbCBhcyBmcm9tIHRoZSBpbmRpdmlkdWFsIHRocmVhZHMgdGhlbXNlbHZlcy4KICAgICAg ICAgc2VsZi51cGRhdGVfc3VtbWFyeShyZXN1bHRfc3VtbWFyeSkKICAgICAgICAgcmV0dXJuICh0 aHJlYWRfdGltaW5ncywgdGVzdF90aW1pbmdzLCBpbmRpdmlkdWFsX3Rlc3RfdGltaW5ncykKIAo= 54106 2010-04-22 16:27:50 -0700 2010-04-22 16:41:05 -0700 Update comments and ChangeLog bug-38011-20100422162749.patch text/plain 5891 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjZmE3ZjBkLi42ZmJjMDk5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDQt MjIgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBjb2RlIHRvIGhlbHAgZGVidWcgbmV3LXJ1 bi13ZWJraXQtdGVzdCBoYW5ncyBvbiB0aGUgQ2hyb21pdW0gYm90cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzgwMTEKKworICAgICAgICBJIGNhbiBz ZWUgbm8gcmVhc29uYWJsZSB3YXkgdG8gdGVzdCB0aGlzIGNoYW5nZS4KKyAgICAgICAgU3R1YmJp bmcgb3V0IHN5cy5fY3VycmVudF9mcmFtZXMoKSBhbmQgdHJhY2ViYWNrLmV4dHJhY3Rfc3RhY2sK KyAgICAgICAgc2VlbXMgZm9sbHkuICBEdW1waW5nIHJlYWwgZGF0YSB3b3VsZCBoYXZlIGxpbmUg bnVtYmVyCisgICAgICAgIChhbmQgcG9zc2libHkgb3RoZXIgY2FsbCBzdGFjaykgdmFyaWFuY2Ug YmV0d2VlbiBydW5zLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cnVuX3dlYmtpdF90ZXN0cy5weToKKyAgICAgICAgIC0gQWRkIF9kdW1wX3RocmVhZF9zdGF0ZXMg YW5kIF9kdW1wX3RocmVhZF9zdGF0ZXNfaWZfbmVjZXNzYXJ5CisgICAgICAgICAgIHRvIGhhdmUg b3VyIG1haW4gdGhyZWFkIGR1bXAgdGhlIHN0YXRlcyBvZiBhbGwgdGhyZWFkcyBldmVyeQorICAg ICAgICAgICA2MCBzZWNvbmRzIHdoZW4gcnVubmluZyBpbiB2ZXJib3NlIG1vZGUuCisgICAgICAg ICAtIEJldHRlciBkb2N1bWVudCB3aGF0IGlzIGdvaW5nIG9uIGluIG91ciBtYWluIGxvb3AuCisK IDIwMTAtMDQtMjIgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBBbmRlcnMgQ2FybHNzb24uCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5IGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQppbmRleCBk ZWI1Mjk3Li5hYTkwNWFiIDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CisrKyBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKQEAgLTIzOCw2ICsy MzgsOSBAQCBjbGFzcyBUZXN0UnVubmVyOgogCiAgICAgICAgIHNlbGYuX3JldHJpZXMgPSAwCiAK KyAgICAgICAgIyBIYWNrIGZvciBkdW1waW5nIHRocmVhZHMgb24gdGhlIGJvdHMKKyAgICAgICAg c2VsZi5fbGFzdF90aHJlYWRfZHVtcCA9IE5vbmUKKwogICAgIGRlZiBfX2RlbF9fKHNlbGYpOgog ICAgICAgICBfbG9nLmRlYnVnKCJmbHVzaGluZyBzdGRvdXQiKQogICAgICAgICBzeXMuc3Rkb3V0 LmZsdXNoKCkKQEAgLTU4Myw2ICs1ODYsMjkgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAgICAg IiIiUmV0dXJucyB3aGV0aGVyIHdlIHNob3VsZCBydW4gYWxsIHRoZSB0ZXN0cyBpbiB0aGUgbWFp biB0aHJlYWQuIiIiCiAgICAgICAgIHJldHVybiBpbnQoc2VsZi5fb3B0aW9ucy5jaGlsZF9wcm9j ZXNzZXMpID09IDEKIAorICAgIGRlZiBfZHVtcF90aHJlYWRfc3RhdGVzKHNlbGYpOgorICAgICAg ICBmb3IgdGhyZWFkX2lkLCBzdGFjayBpbiBzeXMuX2N1cnJlbnRfZnJhbWVzKCkuaXRlbXMoKToK KyAgICAgICAgICAgICMgRklYTUU6IFB5dGhvbiAyLjYgaGFzIHRocmVhZC5pZGVudCB3aGljaCB3 ZSBjb3VsZAorICAgICAgICAgICAgIyB1c2UgdG8gbWFwIGZyb20gdGhyZWFkX2lkIGJhY2sgdG8g dGhyZWFkLm5hbWUKKyAgICAgICAgICAgIHByaW50ICJcbiMgVGhyZWFkOiAlZCIgJSB0aHJlYWRf aWQKKyAgICAgICAgICAgIGZvciBmaWxlbmFtZSwgbGluZW5vLCBuYW1lLCBsaW5lIGluIHRyYWNl YmFjay5leHRyYWN0X3N0YWNrKHN0YWNrKToKKyAgICAgICAgICAgICAgICBwcmludCAnRmlsZTog IiVzIiwgbGluZSAlZCwgaW4gJXMnICUgKGZpbGVuYW1lLCBsaW5lbm8sIG5hbWUpCisgICAgICAg ICAgICAgICAgaWYgbGluZToKKyAgICAgICAgICAgICAgICAgICAgcHJpbnQgIiAgJXMiICUgKGxp bmUuc3RyaXAoKSkKKworICAgIGRlZiBfZHVtcF90aHJlYWRfc3RhdGVzX2lmX25lY2Vzc2FyeShz ZWxmKToKKyAgICAgICAgIyBIQUNLOiBEdW1wIHRocmVhZCBzdGF0ZXMgZXZlcnkgbWludXRlIHRv IGZpZ3VyZSBvdXQgd2hhdCdzCisgICAgICAgICMgaGFuZ2luZyBvbiB0aGUgYm90cy4KKyAgICAg ICAgaWYgbm90IHNlbGYuX29wdGlvbnMudmVyYm9zZToKKyAgICAgICAgICAgIHJldHVybgorICAg ICAgICBkdW1wX3RocmVhZHNfZXZlcnkgPSA2MCAgIyBEdW1wIGV2ZXJ5IG1pbnV0ZQorICAgICAg ICBpZiBub3Qgc2VsZi5fbGFzdF90aHJlYWRfZHVtcDoKKyAgICAgICAgICAgIHNlbGYuX2xhc3Rf dGhyZWFkX2R1bXAgPSB0aW1lLnRpbWUoKQorICAgICAgICB0aW1lX3NpbmNlX2xhc3RfZHVtcCA9 IHRpbWUudGltZSgpIC0gc2VsZi5fbGFzdF90aHJlYWRfZHVtcAorICAgICAgICBpZiAgdGltZV9z aW5jZV9sYXN0X2R1bXAgPiBkdW1wX3RocmVhZHNfZXZlcnk6CisgICAgICAgICAgICBzZWxmLl9k dW1wX3RocmVhZF9zdGF0ZXMoKQorICAgICAgICAgICAgc2VsZi5fbGFzdF90aHJlYWRfZHVtcCA9 IHRpbWUudGltZSgpCisKICAgICBkZWYgX3J1bl90ZXN0cyhzZWxmLCBmaWxlX2xpc3QsIHJlc3Vs dF9zdW1tYXJ5KToKICAgICAgICAgIiIiUnVucyB0aGUgdGVzdHMgaW4gdGhlIGZpbGVfbGlzdC4K IApAQCAtNTk3LDYgKzYyMyw3IEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAgICAgICAgICAgIGlu IHRoZSBmb3JtIHtmaWxlbmFtZTpmaWxlbmFtZSwgdGVzdF9ydW5fdGltZTp0ZXN0X3J1bl90aW1l fQogICAgICAgICAgICAgcmVzdWx0X3N1bW1hcnk6IHN1bW1hcnkgb2JqZWN0IHRvIHBvcHVsYXRl IHdpdGggdGhlIHJlc3VsdHMKICAgICAgICAgIiIiCisgICAgICAgICMgRklYTUU6IFdlIHNob3Vs ZCB1c2Ugd2Via2l0cHkudG9vbC5ncmFtbWFyLnBsdXJhbGl6ZSBoZXJlLgogICAgICAgICBwbHVy YWwgPSAiIgogICAgICAgICBpZiBzZWxmLl9vcHRpb25zLmNoaWxkX3Byb2Nlc3NlcyA+IDE6CiAg ICAgICAgICAgICBwbHVyYWwgPSAicyIKQEAgLTYxMiwyMSArNjM5LDI4IEBAIGNsYXNzIFRlc3RS dW5uZXI6CiAgICAgICAgIGluZGl2aWR1YWxfdGVzdF90aW1pbmdzID0gW10KICAgICAgICAgdGhy ZWFkX3RpbWluZ3MgPSBbXQogICAgICAgICB0cnk6CisgICAgICAgICAgICAjIExvb3AgdGhyb3Vn aCBhbGwgdGhlIHRocmVhZHMgd2FpdGluZyBmb3IgdGhlbSB0byBmaW5pc2guCiAgICAgICAgICAg ICBmb3IgdGhyZWFkIGluIHRocmVhZHM6CisgICAgICAgICAgICAgICAgIyBGSVhNRTogV2UnbGwg ZW5kIHVwIHdhaXRpbmcgb24gdGhlIGZpcnN0IHRocmVhZCB0aGUgd2hvbGUKKyAgICAgICAgICAg ICAgICAjIHRpbWUuICBUaGF0IG1lYW5zIHdlIHdvbid0IG5vdGljZSBleGNlcHRpb25zIG9uIG90 aGVyCisgICAgICAgICAgICAgICAgIyB0aHJlYWRzIHVudGlsIHRoZSBmaXJzdCBvbmUgZXhpdHMu CisgICAgICAgICAgICAgICAgIyBXZSBzaG91bGQgaW5zdGVhZCB3aGlsZSBUcnVlOiBpbiB0aGUg b3V0ZXIgbG9vcAorICAgICAgICAgICAgICAgICMgYW5kIHRoZW4gbG9vcCB0aHJvdWdoIHRocmVh ZHMgam9pbmluZyBhbmQgY2hlY2tpbmcKKyAgICAgICAgICAgICAgICAjIGlzQWxpdmUgYW5kIGdl dF9leGNlcHRpb25faW5mby4gIEV4aXRpbmcgb24gYW55IGV4Y2VwdGlvbi4KICAgICAgICAgICAg ICAgICB3aGlsZSB0aHJlYWQuaXNBbGl2ZSgpOgotICAgICAgICAgICAgICAgICAgICAjIExldCBp dCB0aW1lb3V0IG9jY2FzaW9uYWxseSBzbyBpdCBjYW4gbm90aWNlIGEKLSAgICAgICAgICAgICAg ICAgICAgIyBLZXlib2FyZEludGVycnVwdC4gQWN0dWFsbHksIHRoZSB0aW1lb3V0IGRvZXNuJ3QK LSAgICAgICAgICAgICAgICAgICAgIyByZWFsbHkgbWF0dGVyOiBhcHBhcmVudGx5IGl0IHN1ZmZp Y2VzIHRvIG5vdCB1c2UKLSAgICAgICAgICAgICAgICAgICAgIyBhbiBpbmRlZmluaXRlIGJsb2Nr aW5nIGpvaW4gZm9yIGl0IHRvCi0gICAgICAgICAgICAgICAgICAgICMgYmUgaW50ZXJydXB0aWJs ZSBieSBLZXlib2FyZEludGVycnVwdC4KKyAgICAgICAgICAgICAgICAgICAgIyBXYWtlIHRoZSBt YWluIHRocmVhZCBldmVyeSAwLjEgc2Vjb25kcyBzbyB3ZQorICAgICAgICAgICAgICAgICAgICAj IGNhbiBjYWxsIHVwZGF0ZV9zdW1tYXJ5IGluIGEgdGltZWx5IGZhc2hpb24uCiAgICAgICAgICAg ICAgICAgICAgIHRocmVhZC5qb2luKDAuMSkKKyAgICAgICAgICAgICAgICAgICAgIyBIQUNLOiBV c2VkIGZvciBkZWJ1Z2dpbmcgdGhyZWFkcyBvbiB0aGUgYm90cy4KKyAgICAgICAgICAgICAgICAg ICAgc2VsZi5fZHVtcF90aHJlYWRfc3RhdGVzX2lmX25lY2Vzc2FyeSgpCiAgICAgICAgICAgICAg ICAgICAgIHNlbGYudXBkYXRlX3N1bW1hcnkocmVzdWx0X3N1bW1hcnkpCisKKyAgICAgICAgICAg ICAgICAjIFRoaXMgdGhyZWFkIGlzIGRvbmUsIHNhdmUgb2ZmIHRoZSB0aW1pbmcgaW5mb3JtYXRp b24uCiAgICAgICAgICAgICAgICAgdGhyZWFkX3RpbWluZ3MuYXBwZW5kKHsnbmFtZSc6IHRocmVh ZC5nZXROYW1lKCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnbnVt X3Rlc3RzJzogdGhyZWFkLmdldF9udW1fdGVzdHMoKSwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICd0b3RhbF90aW1lJzogdGhyZWFkLmdldF90b3RhbF90aW1lKCl9KQog ICAgICAgICAgICAgICAgIHRlc3RfdGltaW5ncy51cGRhdGUodGhyZWFkLmdldF9kaXJlY3Rvcnlf dGltaW5nX3N0YXRzKCkpCi0gICAgICAgICAgICAgICAgaW5kaXZpZHVhbF90ZXN0X3RpbWluZ3Mu ZXh0ZW5kKAotICAgICAgICAgICAgICAgICAgICB0aHJlYWQuZ2V0X3Rlc3RfcmVzdWx0cygpKQor ICAgICAgICAgICAgICAgIGluZGl2aWR1YWxfdGVzdF90aW1pbmdzLmV4dGVuZCh0aHJlYWQuZ2V0 X3Rlc3RfcmVzdWx0cygpKQogICAgICAgICBleGNlcHQgS2V5Ym9hcmRJbnRlcnJ1cHQ6CiAgICAg ICAgICAgICBmb3IgdGhyZWFkIGluIHRocmVhZHM6CiAgICAgICAgICAgICAgICAgdGhyZWFkLmNh bmNlbCgpCkBAIC02NDAsNyArNjc0LDkgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAgICAgICAg ICAgICAjIHdvdWxkIGJlIGFzc3VtZWQgdG8gaGF2ZSBwYXNzZWQuCiAgICAgICAgICAgICAgICAg cmFpc2UgZXhjZXB0aW9uX2luZm9bMF0sIGV4Y2VwdGlvbl9pbmZvWzFdLCBleGNlcHRpb25faW5m b1syXQogCi0gICAgICAgICMgTWFrZSBzdXJlIHdlIHBpY2sgdXAgYW55IHJlbWFpbmluZyB0ZXN0 cy4KKyAgICAgICAgIyBGSVhNRTogVGhpcyB1cGRhdGVfc3VtbWFyeSBjYWxsIHNlZW1zIHVuZWNl c3NhcnkuCisgICAgICAgICMgQ2FsbHMgYXJlIGFscmVhZHkgbWFkZSByaWdodCBhZnRlciBqb2lu KCkgYWJvdmUsCisgICAgICAgICMgYXMgd2VsbCBhcyBmcm9tIHRoZSBpbmRpdmlkdWFsIHRocmVh ZHMgdGhlbXNlbHZlcy4KICAgICAgICAgc2VsZi51cGRhdGVfc3VtbWFyeShyZXN1bHRfc3VtbWFy eSkKICAgICAgICAgcmV0dXJuICh0aHJlYWRfdGltaW5ncywgdGVzdF90aW1pbmdzLCBpbmRpdmlk dWFsX3Rlc3RfdGltaW5ncykKIAo=