65995 2011-08-10 10:25:13 -0700 Clean up ChromiumDriver a little 2011-08-10 11:36:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric eric abarth dpranke jamesr tony webkit.review.bot oldest_to_newest 449219 0 eric 2011-08-10 10:25:13 -0700 Clean up ChromiumDriver a little 449220 1 103501 eric 2011-08-10 10:26:42 -0700 Created attachment 103501 Patch 449223 2 103503 eric 2011-08-10 10:28:47 -0700 Created attachment 103503 Fix typo caught by test-webkitpy 449224 3 eric 2011-08-10 10:30:01 -0700 I got here because I was looking at all use of ServerProcess and found that ChromiumDriver (surprisingly!) does not use the ServerProcess abstraction. 449228 4 103503 abarth 2011-08-10 10:43:55 -0700 Comment on attachment 103503 Fix typo caught by test-webkitpy View in context: https://bugs.webkit.org/attachment.cgi?id=103503&action=review > Tools/Scripts/webkitpy/layout_tests/port/chromium.py:487 > raise e You should just say "raise" instead of "raise e". That re-raises the original exception. 449243 5 103503 webkit.review.bot 2011-08-10 10:58:14 -0700 Comment on attachment 103503 Fix typo caught by test-webkitpy Clearing flags on attachment: 103503 Committed r92777: <http://trac.webkit.org/changeset/92777> 449244 6 webkit.review.bot 2011-08-10 10:58:19 -0700 All reviewed patches have been landed. Closing bug. 449264 7 jamesr 2011-08-10 11:36:04 -0700 Stack: Starting testing ...Process _Process-1: Traceback (most recent call last): File "/usr/lib/python2.6/multiprocessing/process.py", line 232, in _bootstrap self.run() File "/usr/local/google/home/jamesr/chrome/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager_worker_broker.py", line 268, in run worker/0 raised AttributeError('ChromiumDriver instance has no attribute '_proc''): layout_tests/controllers/worker.py:91 (in run) self._worker_connection.run_message_loop() layout_tests/controllers/message_broker.py:191 (in run_message_loop) self._broker.run_message_loop(self._run_topic, self._client, delay_secs) layout_tests/controllers/message_broker.py:127 (in run_message_loop) self._run_loop(topic_name, client, block=True, delay_secs=delay_secs) layout_tests/controllers/message_broker.py:141 (in _run_loop) self._dispatch_message(msg, client) layout_tests/controllers/message_broker.py:150 (in _dispatch_message) message_handler(message.src, *optargs) layout_tests/controllers/worker.py:111 (in handle_test_list) self._run_test(test_input) layout_tests/controllers/worker.py:126 (in _run_test) result = self.run_test_with_timeout(test_input, test_timeout_sec) layout_tests/controllers/worker.py:165 (in run_test_with_timeout) return self._run_test_in_this_thread(test_input) layout_tests/controllers/worker.py:249 (in _run_test_in_this_thread) self._driver.start() layout_tests/port/chromium.py:437 (in start) assert not self._proc 103501 2011-08-10 10:26:42 -0700 2011-08-10 10:28:43 -0700 Patch bug-65995-20110810102641.patch text/plain 11186 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTI3NjgKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4Y2M5YTJjMzc1ODI5MDgxMmZhN2U3NWQ5NDhhMzYwZDdm NzY4Y2JlLi4wZjY3MmFkMDBmYTE0NjBiNTljMzc5YWI0MGVlM2IwYTExZjAzM2Q4IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDgtMTAgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IENsZWFuIHVwIENocm9taXVtRHJpdmVyIGEgbGl0dGxlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTk5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gV2Ugbm8gbG9uZ2VyIHN1cHBvcnQgdGhyZWFkaW5n LCBzbyByZW1vdmUgdGhyZWFkaW5nIHNwZWNpZmljIGNvZGUuCisgICAgICAgIC0gQWRkIEZJWE1F cyBhYm91dCB1c2luZyBTZXJ2ZXJQcm9jZXNzIGluc3RlYWQuCisgICAgICAgIC0gQ29uZGVuc2Ug b3B0aW9uLW1hcHBpbmcgaWYtY2FzY2FkZSBpbnRvIGEgZm9yIGxvb3AuCisgICAgICAgIC0gVW5p bmRlbnQgbG9uZyBpZiBibG9ja3MgYnkgdXNpbmcgZWFybHkgcmV0dXJuLgorICAgICAgICAtIFVu d3JhcCBsaW5lcyB3aGljaCBhcmUgbmVlZGxlc3NseSB3cmFwcGVkLgorCisgICAgICAgIFRoZXJl IHNob3VsZCBiZSBubyBmdW5jdGlvbmFsIGNoYW5nZXMgaGVyZSwganVzdCBjb2RlIGNsZWFudXAv ZGVhZC1jb2RlIHJlbW92YWwuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtLnB5OgorCiAyMDExLTA4LTEwICBBZGFtIEJhcnRoICA8YWJhcnRo QHdlYmtpdC5vcmc+CiAKICAgICAgICAgVGhlIFVSTCB3ZSB3ZXJlIGNvbXB1dGluZyBmb3IgcmV0 cmlldmluZyBiYXNlbGluZXMgd2FzIG1pc3NpbmcgYSBzbGFzaApkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKaW5kZXggMTJkMjJk OTcwZWUwMDEwNjQxNmZkOTQzNWNjNTczMWU3MzU0MGVlNC4uNDg4OWJlYzJkMmM5ZjI4MzRkODIy ZWE5NDhlNWQyMzhjYmFkNjQzNiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CkBAIC0zODMsNiArMzgzLDcgQEAgY2xhc3Mg Q2hyb21pdW1Qb3J0KFBvcnQpOgogICAgICAgICByZXR1cm4gc2VsZi5fYnVpbGRfcGF0aChzZWxm LmdldF9vcHRpb24oJ2NvbmZpZ3VyYXRpb24nKSwgYmluYXJ5X25hbWUpCiAKIAorIyBGSVhNRTog VGhpcyBzaG91bGQgaW5oZXJpdCBmcm9tIFdlYktpdERyaXZlciBub3cgdGhhdCBDaHJvbWl1bSBo YXMgYSBEdW1wUmVuZGVyVHJlZSBwcm9jZXNzIGxpa2UgdGhlIHJlc3Qgb2YgV2ViS2l0LgogY2xh c3MgQ2hyb21pdW1Ecml2ZXIoRHJpdmVyKToKICAgICBLSUxMX1RJTUVPVVQgPSAzLjAKIApAQCAt Mzk0LDM3ICszOTUsMzEgQEAgY2xhc3MgQ2hyb21pdW1Ecml2ZXIoRHJpdmVyKToKIAogICAgIGRl ZiBfd3JhcHBlcl9vcHRpb25zKHNlbGYpOgogICAgICAgICBjbWQgPSBbXQotICAgICAgICAjIEZJ WE1FOiBXZSBzaG91bGQgYmUgYWJsZSB0byBidWlsZCB0aGlzIGxpc3QgdXNpbmcgb25seSBhbiBh cnJheSBvZgotICAgICAgICAjIG9wdGlvbiBuYW1lcywgdGhlIG9wdGlvbnMgKG9wdHBhcnNlLlZh bHVlcykgb2JqZWN0LCBhbmQgdGhlIG9yaWduYWwKLSAgICAgICAgIyBsaXN0IG9mIG9wdGlvbnMg ZnJvbSB0aGUgbWFpbiBtZXRob2QgYnkgbG9va2luZyB1cCB0aGUgb3B0aW9uCi0gICAgICAgICMg dGV4dCBmcm9tIHRoZSBvcHRpb25zIGxpc3QgaWYgdGhlIHZhbHVlIGlzIG5vbi1Ob25lLgogICAg ICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRpb24oJ3BpeGVsX3Rlc3RzJyk6CiAgICAgICAgICAg ICAjIFNlZSBub3RlIGFib3ZlIGluIGRpZmZfaW1hZ2UoKSBmb3Igd2h5IHdlIG5lZWQgX2NvbnZl cnRfcGF0aCgpLgogICAgICAgICAgICAgY21kLmFwcGVuZCgiLS1waXhlbC10ZXN0cz0iICsgc2Vs Zi5fcG9ydC5fY29udmVydF9wYXRoKHNlbGYuX2ltYWdlX3BhdGgpKQotCi0gICAgICAgIGlmIHNl bGYuX3BvcnQuZ2V0X29wdGlvbignc3RhcnR1cF9kaWFsb2cnKToKLSAgICAgICAgICAgIGNtZC5h cHBlbmQoJy0tdGVzdHNoZWxsLXN0YXJ0dXAtZGlhbG9nJykKLQotICAgICAgICBpZiBzZWxmLl9w b3J0LmdldF9vcHRpb24oJ2dwX2ZhdWx0X2Vycm9yX2JveCcpOgotICAgICAgICAgICAgY21kLmFw cGVuZCgnLS1ncC1mYXVsdC1lcnJvci1ib3gnKQotCisgICAgICAgICMgRklYTUU6IFRoaXMgaXMg bm90IE5vbmUgc2hvdWxkbid0IGJlIG5lY2Vzc2FyeSwgdW5sZXNzIC0tanMtZmxhZ3M9IicnIiBj aGFuZ2VzIGJlaGF2aW9yIHNvbWVob3c/CiAgICAgICAgIGlmIHNlbGYuX3BvcnQuZ2V0X29wdGlv bignanNfZmxhZ3MnKSBpcyBub3QgTm9uZToKICAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tanMt ZmxhZ3M9IicgKyBzZWxmLl9wb3J0LmdldF9vcHRpb24oJ2pzX2ZsYWdzJykgKyAnIicpCiAKLSAg ICAgICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCdzdHJlc3Nfb3B0Jyk6Ci0gICAgICAgICAg ICBjbWQuYXBwZW5kKCctLXN0cmVzcy1vcHQnKQotCi0gICAgICAgIGlmIHNlbGYuX3BvcnQuZ2V0 X29wdGlvbignc3RyZXNzX2Rlb3B0Jyk6Ci0gICAgICAgICAgICBjbWQuYXBwZW5kKCctLXN0cmVz cy1kZW9wdCcpCi0KLSAgICAgICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCdhY2NlbGVyYXRl ZF9jb21wb3NpdGluZycpOgotICAgICAgICAgICAgY21kLmFwcGVuZCgnLS1lbmFibGUtYWNjZWxl cmF0ZWQtY29tcG9zaXRpbmcnKQotICAgICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRpb24oJ2Fj Y2VsZXJhdGVkXzJkX2NhbnZhcycpOgotICAgICAgICAgICAgY21kLmFwcGVuZCgnLS1lbmFibGUt YWNjZWxlcmF0ZWQtMmQtY2FudmFzJykKLSAgICAgICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9u KCdhY2NlbGVyYXRlZF9kcmF3aW5nJyk6Ci0gICAgICAgICAgICBjbWQuYXBwZW5kKCctLWVuYWJs ZS1hY2NlbGVyYXRlZC1kcmF3aW5nJykKLSAgICAgICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9u KCdlbmFibGVfaGFyZHdhcmVfZ3B1Jyk6Ci0gICAgICAgICAgICBjbWQuYXBwZW5kKCctLWVuYWJs ZS1oYXJkd2FyZS1ncHUnKQorICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGQgYmUgYWJsZSB0byBi dWlsZCB0aGlzIGxpc3QgdXNpbmcgb25seSBhbiBhcnJheSBvZgorICAgICAgICAjIG9wdGlvbiBu YW1lcywgdGhlIG9wdGlvbnMgKG9wdHBhcnNlLlZhbHVlcykgb2JqZWN0LCBhbmQgdGhlIG9yaWdu YWwKKyAgICAgICAgIyBsaXN0IG9mIG9wdGlvbnMgZnJvbSB0aGUgbWFpbiBtZXRob2QgYnkgbG9v a2luZyB1cCB0aGUgb3B0aW9uCisgICAgICAgICMgdGV4dCBmcm9tIHRoZSBvcHRpb25zIGxpc3Qg aWYgdGhlIHZhbHVlIGlzIG5vbi1Ob25lLgorICAgICAgICAjIEZJWE1FOiBIb3cgbWFueSBvZiB0 aGVzZSBvcHRpb25zIGFyZSBzdGlsbCB1c2VkPworICAgICAgICBvcHRpb25fbWFwcGluZ3MgPSB7 CisgICAgICAgICAgICAnc3RhcnR1cF9kaWFsb2cnOiAnLS10ZXN0c2hlbGwtc3RhcnR1cC1kaWFs b2cnLAorICAgICAgICAgICAgJ2dwX2ZhdWx0X2Vycm9yX2JveCc6ICctLWdwLWZhdWx0LWVycm9y LWJveCcsCisgICAgICAgICAgICAnc3RyZXNzX29wdCc6ICctLXN0cmVzcy1vcHQnLAorICAgICAg ICAgICAgJ3N0cmVzc19kZW9wdCc6ICctLXN0cmVzcy1kZW9wdCcsCisgICAgICAgICAgICAnYWNj ZWxlcmF0ZWRfY29tcG9zaXRpbmcnOiAnLS1lbmFibGUtYWNjZWxlcmF0ZWQtY29tcG9zaXRpbmcn LAorICAgICAgICAgICAgJ2FjY2VsZXJhdGVkXzJkX2NhbnZhcyc6ICctLWVuYWJsZS1hY2NlbGVy YXRlZC0yZC1jYW52YXMnLAorICAgICAgICAgICAgJ2FjY2VsZXJhdGVkX2RyYXdpbmcnOiAnLS1l bmFibGUtYWNjZWxlcmF0ZWQtZHJhd2luZycsCisgICAgICAgICAgICAnZW5hYmxlX2hhcmR3YXJl X2dwdSc6ICctLS0tZW5hYmxlLWhhcmR3YXJlLWdwdScsCisgICAgICAgIH0KKyAgICAgICAgZm9y IG5yd3Rfb3B0aW9uLCBkcnRfb3B0aW9uIGluIG9wdGlvbl9tYXBwaW5nczoKKyAgICAgICAgICAg IGlmIHNlbGYuX3BvcnQuZ2V0X29wdGlvbihucnd0X29wdGlvbik6CisgICAgICAgICAgICAgICAg Y21kLmFwcGVuZChkcnRfb3B0aW9uKQogCiAgICAgICAgIGNtZC5leHRlbmQoc2VsZi5fcG9ydC5n ZXRfb3B0aW9uKCdhZGRpdGlvbmFsX2RydF9mbGFnJywgW10pKQogICAgICAgICByZXR1cm4gY21k CkBAIC00MzIsMjQgKzQyNywxNyBAQCBjbGFzcyBDaHJvbWl1bURyaXZlcihEcml2ZXIpOgogICAg IGRlZiBjbWRfbGluZShzZWxmKToKICAgICAgICAgY21kID0gc2VsZi5fY29tbWFuZF93cmFwcGVy KHNlbGYuX3BvcnQuZ2V0X29wdGlvbignd3JhcHBlcicpKQogICAgICAgICBjbWQuYXBwZW5kKHNl bGYuX3BvcnQuX3BhdGhfdG9fZHJpdmVyKCkpCi0gICAgICAgIGNtZC5hcHBlbmQoJy0tdGVzdC1z aGVsbCcpICAjIEZJWE1FOiBXaHkgZG9lcyB0aGlzIGV4aXN0PyAgVGVzdFNoZWxsIGlzIGRlYWQs IHNob3VsZG4ndCB0aGlzIGJlIHJlbW92ZWQ/CisgICAgICAgICMgRklYTUU6IFdoeSBkb2VzIC0t dGVzdC1zaGVsbCBleGlzdD8gIFRlc3RTaGVsbCBpcyBkZWFkLCBzaG91bGRuJ3QgdGhpcyBiZSBy ZW1vdmVkPworICAgICAgICAjIEl0IHNlZW1zIGl0J3Mgc3RpbGwgaW4gdXNlIGluIFRvb2xzL0R1 bXBSZW5kZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5kZXJUcmVlLmNwcCBhcyBvZiA4LzEwLzExLgor ICAgICAgICBjbWQuYXBwZW5kKCctLXRlc3Qtc2hlbGwnKQogICAgICAgICBjbWQuZXh0ZW5kKHNl bGYuX3dyYXBwZXJfb3B0aW9ucygpKQogICAgICAgICByZXR1cm4gY21kCiAKICAgICBkZWYgc3Rh cnQoc2VsZik6Ci0gICAgICAgICMgRklYTUU6IFNob3VsZCBiZSBhbiBlcnJvciB0byBjYWxsIHRo aXMgbWV0aG9kIHR3aWNlLgotICAgICAgICBjbWQgPSBzZWxmLmNtZF9saW5lKCkKLQotICAgICAg ICAjIFdlIG5lZWQgdG8gcGFzcyBjbG9zZV9mZHM9VHJ1ZSB0byB3b3JrIGFyb3VuZCBQeXRob24g YnVnICMyMzIwCi0gICAgICAgICMgKG90aGVyd2lzZSB3ZSBjYW4gaGFuZyB3aGVuIHdlIGtpbGwg RHVtcFJlbmRlclRyZWUgd2hlbiB3ZSBhcmUgcnVubmluZwotICAgICAgICAjIG11bHRpcGxlIHRo cmVhZHMpLiBTZWUgaHR0cDovL2J1Z3MucHl0aG9uLm9yZy9pc3N1ZTIzMjAgLgotICAgICAgICAj IE5vdGUgdGhhdCBjbG9zZV9mZHMgaXNuJ3Qgc3VwcG9ydGVkIG9uIFdpbmRvd3MsIGJ1dCB0aGlz IGJ1ZyBvbmx5Ci0gICAgICAgICMgc2hvd3MgdXAgb24gTWFjIGFuZCBMaW51eC4KLSAgICAgICAg Y2xvc2VfZmxhZyA9IHN5cy5wbGF0Zm9ybSBub3QgaW4gKCd3aW4zMicsICdjeWd3aW4nKQotICAg ICAgICBzZWxmLl9wcm9jID0gc3VicHJvY2Vzcy5Qb3BlbihjbWQsIHN0ZGluPXN1YnByb2Nlc3Mu UElQRSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PXN1YnBy b2Nlc3MuUElQRSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RkZXJy PXN1YnByb2Nlc3MuU1RET1VULAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjbG9zZV9mZHM9Y2xvc2VfZmxhZykKKyAgICAgICAgYXNzZXJ0IG5vdCBzZWxmLl9wcm9jCisg ICAgICAgICMgRklYTUU6IFRoaXMgc2hvdWxkIHVzZSBTZXJ2ZXJQcm9jZXNzIGxpa2UgV2ViS2l0 RHJpdmVyIGRvZXMuCisgICAgICAgICMgRklYTUU6IFdlIHNob3VsZCBiZSByZWFkaW5nIHN0ZGVy ciBhbmQgc3Rkb3V0IHNlcGFyYXRlbHkgbGlrZSBob3cgV2ViS2l0RHJpdmVyIGRvZXMuCisgICAg ICAgIHNlbGYuX3Byb2MgPSBzdWJwcm9jZXNzLlBvcGVuKHNlbGYuY21kX2xpbmUoKSwgc3RkaW49 c3VicHJvY2Vzcy5QSVBFLCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLCBzdGRlcnI9c3VicHJvY2Vz cy5TVERPVVQpCiAKICAgICBkZWYgcG9sbChzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX3By b2MucG9sbCgpCkBAIC00ODIsMTAgKzQ3MCw4IEBAIGNsYXNzIENocm9taXVtRHJpdmVyKERyaXZl cik6CiAgICAgICAgIHJldHVybiBjbWQKIAogICAgIGRlZiBfb3V0cHV0X2ltYWdlKHNlbGYpOgot ICAgICAgICAiIiJSZXR1cm5zIHRoZSBpbWFnZSBvdXRwdXQgd2hpY2ggZHJpdmVyIGdlbmVyYXRl ZC4iIiIKLSAgICAgICAgcG5nX3BhdGggPSBzZWxmLl9pbWFnZV9wYXRoCi0gICAgICAgIGlmIHBu Z19wYXRoIGFuZCBzZWxmLl9wb3J0Ll9maWxlc3lzdGVtLmV4aXN0cyhwbmdfcGF0aCk6Ci0gICAg ICAgICAgICByZXR1cm4gc2VsZi5fcG9ydC5fZmlsZXN5c3RlbS5yZWFkX2JpbmFyeV9maWxlKHBu Z19wYXRoKQorICAgICAgICBpZiBzZWxmLl9pbWFnZV9wYXRoIGFuZCBzZWxmLl9wb3J0Ll9maWxl c3lzdGVtLmV4aXN0cyhzZWxmLl9pbWFnZV9wYXRoKToKKyAgICAgICAgICAgIHJldHVybiBzZWxm Ll9wb3J0Ll9maWxlc3lzdGVtLnJlYWRfYmluYXJ5X2ZpbGUoc2VsZi5faW1hZ2VfcGF0aCkKICAg ICAgICAgcmV0dXJuIE5vbmUKIAogICAgIGRlZiBfb3V0cHV0X2ltYWdlX3dpdGhfcmV0cnkoc2Vs Zik6CkBAIC00OTMsMjAgKzQ3OSwyMCBAQCBjbGFzcyBDaHJvbWl1bURyaXZlcihEcml2ZXIpOgog ICAgICAgICAjIHJhaXNpbmcgIklPRXJyb3I6IFtFcnJubyAxM10gUGVybWlzc2lvbiBkZW5pZWQ6 IgogICAgICAgICByZXRyeV9udW0gPSA1MAogICAgICAgICB0aW1lb3V0X3NlY29uZHMgPSA1LjAK LSAgICAgICAgZm9yIGkgaW4gcmFuZ2UocmV0cnlfbnVtKToKKyAgICAgICAgZm9yIF8gaW4gcmFu Z2UocmV0cnlfbnVtKToKICAgICAgICAgICAgIHRyeToKICAgICAgICAgICAgICAgICByZXR1cm4g c2VsZi5fb3V0cHV0X2ltYWdlKCkKICAgICAgICAgICAgIGV4Y2VwdCBJT0Vycm9yLCBlOgotICAg ICAgICAgICAgICAgIGlmIGUuZXJybm8gPT0gZXJybm8uRUFDQ0VTOgotICAgICAgICAgICAgICAg ICAgICB0aW1lLnNsZWVwKHRpbWVvdXRfc2Vjb25kcyAvIHJldHJ5X251bSkKLSAgICAgICAgICAg ICAgICBlbHNlOgorICAgICAgICAgICAgICAgIGlmIGUuZXJybm8gIT0gZXJybm8uRUFDQ0VTOgog ICAgICAgICAgICAgICAgICAgICByYWlzZSBlCisgICAgICAgICAgICAjIEZJWE1FOiBXZSBzaG91 bGQgaGF2ZSBhIHNlcGFyYXRlIHJldHJ5IGRlbGF5LgorICAgICAgICAgICAgIyBUaGlzIGltcGxl bWVudGF0aW9uIGlzIGxpa2VseSB0byBleGNlZWQgdGhlIHRpbWVvdXQgYmVmb3JlIHRoZSBleHBl Y3RlZCBudW1iZXIgb2YgcmV0cmllcy4KKyAgICAgICAgICAgIHRpbWUuc2xlZXAodGltZW91dF9z ZWNvbmRzIC8gcmV0cnlfbnVtKQogICAgICAgICByZXR1cm4gc2VsZi5fb3V0cHV0X2ltYWdlKCkK IAogICAgIGRlZiBfY2xlYXJfb3V0cHV0X2ltYWdlKHNlbGYpOgotICAgICAgICBwbmdfcGF0aCA9 IHNlbGYuX2ltYWdlX3BhdGgKLSAgICAgICAgaWYgcG5nX3BhdGggYW5kIHNlbGYuX3BvcnQuX2Zp bGVzeXN0ZW0uZXhpc3RzKHBuZ19wYXRoKToKLSAgICAgICAgICAgIHNlbGYuX3BvcnQuX2ZpbGVz eXN0ZW0ucmVtb3ZlKHBuZ19wYXRoKQorICAgICAgICBpZiBzZWxmLl9pbWFnZV9wYXRoIGFuZCBz ZWxmLl9wb3J0Ll9maWxlc3lzdGVtLmV4aXN0cyhzZWxmLl9pbWFnZV9wYXRoKToKKyAgICAgICAg ICAgIHNlbGYuX3BvcnQuX2ZpbGVzeXN0ZW0ucmVtb3ZlKHNlbGYuX2ltYWdlX3BhdGgpCiAKICAg ICBkZWYgcnVuX3Rlc3Qoc2VsZiwgZHJpdmVyX2lucHV0KToKICAgICAgICAgb3V0cHV0ID0gW10K QEAgLTU0NSwxMCArNTMxLDggQEAgY2xhc3MgQ2hyb21pdW1Ecml2ZXIoRHJpdmVyKToKICAgICAg ICAgICAgICAgICBhY3R1YWxfdXJpID0gbGluZS5yc3RyaXAoKVs1Ol0KICAgICAgICAgICAgICAg ICBpZiB1cmkgIT0gYWN0dWFsX3VyaToKICAgICAgICAgICAgICAgICAgICAgIyBHVVJMIGNhcGl0 YWxpemVzIHRoZSBkcml2ZSBsZXR0ZXIgb2YgYSBmaWxlIFVSTC4KLSAgICAgICAgICAgICAgICAg ICAgaWYgKG5vdCByZS5zZWFyY2goIl5maWxlOi8vL1thLXpdOiIsIHVyaSkgb3IKLSAgICAgICAg ICAgICAgICAgICAgICAgIHVyaS5sb3dlcigpICE9IGFjdHVhbF91cmkubG93ZXIoKSk6Ci0gICAg ICAgICAgICAgICAgICAgICAgICBfbG9nLmZhdGFsKCJUZXN0IGdvdCBvdXQgb2Ygc3luYzpcbnwl c3xcbnwlc3wiICUKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHVyaSwgYWN0 dWFsX3VyaSkpCisgICAgICAgICAgICAgICAgICAgIGlmIChub3QgcmUuc2VhcmNoKCJeZmlsZTov Ly9bYS16XToiLCB1cmkpIG9yIHVyaS5sb3dlcigpICE9IGFjdHVhbF91cmkubG93ZXIoKSk6Cisg ICAgICAgICAgICAgICAgICAgICAgICBfbG9nLmZhdGFsKCJUZXN0IGdvdCBvdXQgb2Ygc3luYzpc bnwlc3xcbnwlc3wiICUgKHVyaSwgYWN0dWFsX3VyaSkpCiAgICAgICAgICAgICAgICAgICAgICAg ICByYWlzZSBBc3NlcnRpb25FcnJvcigidGVzdCBvdXQgb2Ygc3luYyIpCiAgICAgICAgICAgICBl bGlmIGxpbmUuc3RhcnRzd2l0aCgiI01ENToiKToKICAgICAgICAgICAgICAgICBhY3R1YWxfY2hl Y2tzdW0gPSBsaW5lLnJzdHJpcCgpWzU6XQpAQCAtNTg3LDIzICs1NzEsMjUgQEAgY2xhc3MgQ2hy b21pdW1Ecml2ZXIoRHJpdmVyKToKICAgICAgICAgICAgIGNyYXNoPWNyYXNoLCB0ZXN0X3RpbWU9 cnVuX3RpbWUsIHRpbWVvdXQ9dGltZW91dCwgZXJyb3I9Jycuam9pbihlcnJvcikpCiAKICAgICBk ZWYgc3RvcChzZWxmKToKLSAgICAgICAgaWYgc2VsZi5fcHJvYzoKLSAgICAgICAgICAgIHNlbGYu X3Byb2Muc3RkaW4uY2xvc2UoKQotICAgICAgICAgICAgc2VsZi5fcHJvYy5zdGRvdXQuY2xvc2Uo KQotICAgICAgICAgICAgaWYgc2VsZi5fcHJvYy5zdGRlcnI6Ci0gICAgICAgICAgICAgICAgc2Vs Zi5fcHJvYy5zdGRlcnIuY2xvc2UoKQotICAgICAgICAgICAgIyBDbG9zaW5nIHN0ZGluL3N0ZG91 dC9zdGRlcnIgaGFuZ3Mgc29tZXRpbWVzIG9uIE9TIFgsCi0gICAgICAgICAgICAjIChzZWUgX19p bml0X18oKSwgYWJvdmUpLCBhbmQgYW55d2F5IHdlIGRvbid0IHdhbnQgdG8gaGFuZwotICAgICAg ICAgICAgIyB0aGUgaGFybmVzcyBpZiBEUlQgaXMgYnVnZ3ksIHNvIHdlIHdhaXQgYSBjb3VwbGUK LSAgICAgICAgICAgICMgc2Vjb25kcyB0byBnaXZlIERSVCBhIGNoYW5jZSB0byBjbGVhbiB1cCwg YnV0IHRoZW4KLSAgICAgICAgICAgICMgZm9yY2Uta2lsbCB0aGUgcHJvY2VzcyBpZiBuZWNlc3Nh cnkuCi0gICAgICAgICAgICB0aW1lb3V0ID0gdGltZS50aW1lKCkgKyBzZWxmLktJTExfVElNRU9V VAotICAgICAgICAgICAgd2hpbGUgc2VsZi5fcHJvYy5wb2xsKCkgaXMgTm9uZSBhbmQgdGltZS50 aW1lKCkgPCB0aW1lb3V0OgotICAgICAgICAgICAgICAgIHRpbWUuc2xlZXAoMC4xKQotICAgICAg ICAgICAgaWYgc2VsZi5fcHJvYy5wb2xsKCkgaXMgTm9uZToKLSAgICAgICAgICAgICAgICBfbG9n Lndhcm5pbmcoJ3N0b3BwaW5nIHRlc3QgZHJpdmVyIHRpbWVkIG91dCwga2lsbGluZyBpdCcpCi0g ICAgICAgICAgICAgICAgc2VsZi5fcG9ydC5fZXhlY3V0aXZlLmtpbGxfcHJvY2VzcyhzZWxmLl9w cm9jLnBpZCkKLSAgICAgICAgICAgICMgRklYTUU6IFRoaXMgaXMgc29tZXRpbWUgTm9uZS4gV2hh dCBpcyB3cm9uZz8gYXNzZXJ0IHNlbGYuX3Byb2MucG9sbCgpIGlzIG5vdCBOb25lCi0gICAgICAg ICAgICBpZiBzZWxmLl9wcm9jLnBvbGwoKSBpcyBub3QgTm9uZToKLSAgICAgICAgICAgICAgICBz ZWxmLl9wcm9jLndhaXQoKQotICAgICAgICAgICAgc2VsZi5fcHJvYyA9IE5vbmUKKyAgICAgICAg aWYgbm90IHNlbGYuX3Byb2M6CisgICAgICAgICAgICByZXR1cm4KKyAgICAgICAgIyBGSVhNRTog SWYgd2UgdXNlZCBTZXJ2ZXJQcm9jZXNzIGFsbCB0aGlzIHdvdWxkIGhhcHBlbiBmb3IgZnJlZSB3 aXRoIFNlcnZlclByb2Nlcy5zdG9wKCkKKyAgICAgICAgc2VsZi5fcHJvYy5zdGRpbi5jbG9zZSgp CisgICAgICAgIHNlbGYuX3Byb2Muc3Rkb3V0LmNsb3NlKCkKKyAgICAgICAgaWYgc2VsZi5fcHJv Yy5zdGRlcnI6CisgICAgICAgICAgICBzZWxmLl9wcm9jLnN0ZGVyci5jbG9zZSgpCisgICAgICAg ICMgQ2xvc2luZyBzdGRpbi9zdGRvdXQvc3RkZXJyIGhhbmdzIHNvbWV0aW1lcyBvbiBPUyBYLAor ICAgICAgICAjIChzZWUgX19pbml0X18oKSwgYWJvdmUpLCBhbmQgYW55d2F5IHdlIGRvbid0IHdh bnQgdG8gaGFuZworICAgICAgICAjIHRoZSBoYXJuZXNzIGlmIERSVCBpcyBidWdneSwgc28gd2Ug d2FpdCBhIGNvdXBsZQorICAgICAgICAjIHNlY29uZHMgdG8gZ2l2ZSBEUlQgYSBjaGFuY2UgdG8g Y2xlYW4gdXAsIGJ1dCB0aGVuCisgICAgICAgICMgZm9yY2Uta2lsbCB0aGUgcHJvY2VzcyBpZiBu ZWNlc3NhcnkuCisgICAgICAgIHRpbWVvdXQgPSB0aW1lLnRpbWUoKSArIHNlbGYuS0lMTF9USU1F T1VUCisgICAgICAgIHdoaWxlIHNlbGYuX3Byb2MucG9sbCgpIGlzIE5vbmUgYW5kIHRpbWUudGlt ZSgpIDwgdGltZW91dDoKKyAgICAgICAgICAgIHRpbWUuc2xlZXAoMC4xKQorICAgICAgICBpZiBz ZWxmLl9wcm9jLnBvbGwoKSBpcyBOb25lOgorICAgICAgICAgICAgX2xvZy53YXJuaW5nKCdzdG9w cGluZyB0ZXN0IGRyaXZlciB0aW1lZCBvdXQsIGtpbGxpbmcgaXQnKQorICAgICAgICAgICAgc2Vs Zi5fcG9ydC5fZXhlY3V0aXZlLmtpbGxfcHJvY2VzcyhzZWxmLl9wcm9jLnBpZCkKKyAgICAgICAg IyBGSVhNRTogVGhpcyBpcyBzb21ldGltZSBOb25lLiBXaGF0IGlzIHdyb25nPyBhc3NlcnQgc2Vs Zi5fcHJvYy5wb2xsKCkgaXMgbm90IE5vbmUKKyAgICAgICAgaWYgc2VsZi5fcHJvYy5wb2xsKCkg aXMgbm90IE5vbmU6CisgICAgICAgICAgICBzZWxmLl9wcm9jLndhaXQoKQorICAgICAgICBzZWxm Ll9wcm9jID0gTm9uZQo= 103503 2011-08-10 10:28:47 -0700 2011-08-10 10:58:14 -0700 Fix typo caught by test-webkitpy bug-65995-20110810102846.patch text/plain 11194 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTI3NjgKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4Y2M5YTJjMzc1ODI5MDgxMmZhN2U3NWQ5NDhhMzYwZDdm NzY4Y2JlLi4wZjY3MmFkMDBmYTE0NjBiNTljMzc5YWI0MGVlM2IwYTExZjAzM2Q4IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDgtMTAgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IENsZWFuIHVwIENocm9taXVtRHJpdmVyIGEgbGl0dGxlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTk5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gV2Ugbm8gbG9uZ2VyIHN1cHBvcnQgdGhyZWFkaW5n LCBzbyByZW1vdmUgdGhyZWFkaW5nIHNwZWNpZmljIGNvZGUuCisgICAgICAgIC0gQWRkIEZJWE1F cyBhYm91dCB1c2luZyBTZXJ2ZXJQcm9jZXNzIGluc3RlYWQuCisgICAgICAgIC0gQ29uZGVuc2Ug b3B0aW9uLW1hcHBpbmcgaWYtY2FzY2FkZSBpbnRvIGEgZm9yIGxvb3AuCisgICAgICAgIC0gVW5p bmRlbnQgbG9uZyBpZiBibG9ja3MgYnkgdXNpbmcgZWFybHkgcmV0dXJuLgorICAgICAgICAtIFVu d3JhcCBsaW5lcyB3aGljaCBhcmUgbmVlZGxlc3NseSB3cmFwcGVkLgorCisgICAgICAgIFRoZXJl IHNob3VsZCBiZSBubyBmdW5jdGlvbmFsIGNoYW5nZXMgaGVyZSwganVzdCBjb2RlIGNsZWFudXAv ZGVhZC1jb2RlIHJlbW92YWwuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtLnB5OgorCiAyMDExLTA4LTEwICBBZGFtIEJhcnRoICA8YWJhcnRo QHdlYmtpdC5vcmc+CiAKICAgICAgICAgVGhlIFVSTCB3ZSB3ZXJlIGNvbXB1dGluZyBmb3IgcmV0 cmlldmluZyBiYXNlbGluZXMgd2FzIG1pc3NpbmcgYSBzbGFzaApkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKaW5kZXggMTJkMjJk OTcwZWUwMDEwNjQxNmZkOTQzNWNjNTczMWU3MzU0MGVlNC4uZGMyNjc0YTY1NzM1ZjE3NjZiYTdh ZGQ4NzQ3ZjZjNDM2MzFhYTYyMiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CkBAIC0zODMsNiArMzgzLDcgQEAgY2xhc3Mg Q2hyb21pdW1Qb3J0KFBvcnQpOgogICAgICAgICByZXR1cm4gc2VsZi5fYnVpbGRfcGF0aChzZWxm LmdldF9vcHRpb24oJ2NvbmZpZ3VyYXRpb24nKSwgYmluYXJ5X25hbWUpCiAKIAorIyBGSVhNRTog VGhpcyBzaG91bGQgaW5oZXJpdCBmcm9tIFdlYktpdERyaXZlciBub3cgdGhhdCBDaHJvbWl1bSBo YXMgYSBEdW1wUmVuZGVyVHJlZSBwcm9jZXNzIGxpa2UgdGhlIHJlc3Qgb2YgV2ViS2l0LgogY2xh c3MgQ2hyb21pdW1Ecml2ZXIoRHJpdmVyKToKICAgICBLSUxMX1RJTUVPVVQgPSAzLjAKIApAQCAt Mzk0LDM3ICszOTUsMzEgQEAgY2xhc3MgQ2hyb21pdW1Ecml2ZXIoRHJpdmVyKToKIAogICAgIGRl ZiBfd3JhcHBlcl9vcHRpb25zKHNlbGYpOgogICAgICAgICBjbWQgPSBbXQotICAgICAgICAjIEZJ WE1FOiBXZSBzaG91bGQgYmUgYWJsZSB0byBidWlsZCB0aGlzIGxpc3QgdXNpbmcgb25seSBhbiBh cnJheSBvZgotICAgICAgICAjIG9wdGlvbiBuYW1lcywgdGhlIG9wdGlvbnMgKG9wdHBhcnNlLlZh bHVlcykgb2JqZWN0LCBhbmQgdGhlIG9yaWduYWwKLSAgICAgICAgIyBsaXN0IG9mIG9wdGlvbnMg ZnJvbSB0aGUgbWFpbiBtZXRob2QgYnkgbG9va2luZyB1cCB0aGUgb3B0aW9uCi0gICAgICAgICMg dGV4dCBmcm9tIHRoZSBvcHRpb25zIGxpc3QgaWYgdGhlIHZhbHVlIGlzIG5vbi1Ob25lLgogICAg ICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRpb24oJ3BpeGVsX3Rlc3RzJyk6CiAgICAgICAgICAg ICAjIFNlZSBub3RlIGFib3ZlIGluIGRpZmZfaW1hZ2UoKSBmb3Igd2h5IHdlIG5lZWQgX2NvbnZl cnRfcGF0aCgpLgogICAgICAgICAgICAgY21kLmFwcGVuZCgiLS1waXhlbC10ZXN0cz0iICsgc2Vs Zi5fcG9ydC5fY29udmVydF9wYXRoKHNlbGYuX2ltYWdlX3BhdGgpKQotCi0gICAgICAgIGlmIHNl bGYuX3BvcnQuZ2V0X29wdGlvbignc3RhcnR1cF9kaWFsb2cnKToKLSAgICAgICAgICAgIGNtZC5h cHBlbmQoJy0tdGVzdHNoZWxsLXN0YXJ0dXAtZGlhbG9nJykKLQotICAgICAgICBpZiBzZWxmLl9w b3J0LmdldF9vcHRpb24oJ2dwX2ZhdWx0X2Vycm9yX2JveCcpOgotICAgICAgICAgICAgY21kLmFw cGVuZCgnLS1ncC1mYXVsdC1lcnJvci1ib3gnKQotCisgICAgICAgICMgRklYTUU6IFRoaXMgaXMg bm90IE5vbmUgc2hvdWxkbid0IGJlIG5lY2Vzc2FyeSwgdW5sZXNzIC0tanMtZmxhZ3M9IicnIiBj aGFuZ2VzIGJlaGF2aW9yIHNvbWVob3c/CiAgICAgICAgIGlmIHNlbGYuX3BvcnQuZ2V0X29wdGlv bignanNfZmxhZ3MnKSBpcyBub3QgTm9uZToKICAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tanMt ZmxhZ3M9IicgKyBzZWxmLl9wb3J0LmdldF9vcHRpb24oJ2pzX2ZsYWdzJykgKyAnIicpCiAKLSAg ICAgICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCdzdHJlc3Nfb3B0Jyk6Ci0gICAgICAgICAg ICBjbWQuYXBwZW5kKCctLXN0cmVzcy1vcHQnKQotCi0gICAgICAgIGlmIHNlbGYuX3BvcnQuZ2V0 X29wdGlvbignc3RyZXNzX2Rlb3B0Jyk6Ci0gICAgICAgICAgICBjbWQuYXBwZW5kKCctLXN0cmVz cy1kZW9wdCcpCi0KLSAgICAgICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCdhY2NlbGVyYXRl ZF9jb21wb3NpdGluZycpOgotICAgICAgICAgICAgY21kLmFwcGVuZCgnLS1lbmFibGUtYWNjZWxl cmF0ZWQtY29tcG9zaXRpbmcnKQotICAgICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRpb24oJ2Fj Y2VsZXJhdGVkXzJkX2NhbnZhcycpOgotICAgICAgICAgICAgY21kLmFwcGVuZCgnLS1lbmFibGUt YWNjZWxlcmF0ZWQtMmQtY2FudmFzJykKLSAgICAgICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9u KCdhY2NlbGVyYXRlZF9kcmF3aW5nJyk6Ci0gICAgICAgICAgICBjbWQuYXBwZW5kKCctLWVuYWJs ZS1hY2NlbGVyYXRlZC1kcmF3aW5nJykKLSAgICAgICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9u KCdlbmFibGVfaGFyZHdhcmVfZ3B1Jyk6Ci0gICAgICAgICAgICBjbWQuYXBwZW5kKCctLWVuYWJs ZS1oYXJkd2FyZS1ncHUnKQorICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGQgYmUgYWJsZSB0byBi dWlsZCB0aGlzIGxpc3QgdXNpbmcgb25seSBhbiBhcnJheSBvZgorICAgICAgICAjIG9wdGlvbiBu YW1lcywgdGhlIG9wdGlvbnMgKG9wdHBhcnNlLlZhbHVlcykgb2JqZWN0LCBhbmQgdGhlIG9yaWdu YWwKKyAgICAgICAgIyBsaXN0IG9mIG9wdGlvbnMgZnJvbSB0aGUgbWFpbiBtZXRob2QgYnkgbG9v a2luZyB1cCB0aGUgb3B0aW9uCisgICAgICAgICMgdGV4dCBmcm9tIHRoZSBvcHRpb25zIGxpc3Qg aWYgdGhlIHZhbHVlIGlzIG5vbi1Ob25lLgorICAgICAgICAjIEZJWE1FOiBIb3cgbWFueSBvZiB0 aGVzZSBvcHRpb25zIGFyZSBzdGlsbCB1c2VkPworICAgICAgICBvcHRpb25fbWFwcGluZ3MgPSB7 CisgICAgICAgICAgICAnc3RhcnR1cF9kaWFsb2cnOiAnLS10ZXN0c2hlbGwtc3RhcnR1cC1kaWFs b2cnLAorICAgICAgICAgICAgJ2dwX2ZhdWx0X2Vycm9yX2JveCc6ICctLWdwLWZhdWx0LWVycm9y LWJveCcsCisgICAgICAgICAgICAnc3RyZXNzX29wdCc6ICctLXN0cmVzcy1vcHQnLAorICAgICAg ICAgICAgJ3N0cmVzc19kZW9wdCc6ICctLXN0cmVzcy1kZW9wdCcsCisgICAgICAgICAgICAnYWNj ZWxlcmF0ZWRfY29tcG9zaXRpbmcnOiAnLS1lbmFibGUtYWNjZWxlcmF0ZWQtY29tcG9zaXRpbmcn LAorICAgICAgICAgICAgJ2FjY2VsZXJhdGVkXzJkX2NhbnZhcyc6ICctLWVuYWJsZS1hY2NlbGVy YXRlZC0yZC1jYW52YXMnLAorICAgICAgICAgICAgJ2FjY2VsZXJhdGVkX2RyYXdpbmcnOiAnLS1l bmFibGUtYWNjZWxlcmF0ZWQtZHJhd2luZycsCisgICAgICAgICAgICAnZW5hYmxlX2hhcmR3YXJl X2dwdSc6ICctLS0tZW5hYmxlLWhhcmR3YXJlLWdwdScsCisgICAgICAgIH0KKyAgICAgICAgZm9y IG5yd3Rfb3B0aW9uLCBkcnRfb3B0aW9uIGluIG9wdGlvbl9tYXBwaW5ncy5pdGVtcygpOgorICAg ICAgICAgICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9uKG5yd3Rfb3B0aW9uKToKKyAgICAgICAg ICAgICAgICBjbWQuYXBwZW5kKGRydF9vcHRpb24pCiAKICAgICAgICAgY21kLmV4dGVuZChzZWxm Ll9wb3J0LmdldF9vcHRpb24oJ2FkZGl0aW9uYWxfZHJ0X2ZsYWcnLCBbXSkpCiAgICAgICAgIHJl dHVybiBjbWQKQEAgLTQzMiwyNCArNDI3LDE3IEBAIGNsYXNzIENocm9taXVtRHJpdmVyKERyaXZl cik6CiAgICAgZGVmIGNtZF9saW5lKHNlbGYpOgogICAgICAgICBjbWQgPSBzZWxmLl9jb21tYW5k X3dyYXBwZXIoc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCd3cmFwcGVyJykpCiAgICAgICAgIGNtZC5h cHBlbmQoc2VsZi5fcG9ydC5fcGF0aF90b19kcml2ZXIoKSkKLSAgICAgICAgY21kLmFwcGVuZCgn LS10ZXN0LXNoZWxsJykgICMgRklYTUU6IFdoeSBkb2VzIHRoaXMgZXhpc3Q/ICBUZXN0U2hlbGwg aXMgZGVhZCwgc2hvdWxkbid0IHRoaXMgYmUgcmVtb3ZlZD8KKyAgICAgICAgIyBGSVhNRTogV2h5 IGRvZXMgLS10ZXN0LXNoZWxsIGV4aXN0PyAgVGVzdFNoZWxsIGlzIGRlYWQsIHNob3VsZG4ndCB0 aGlzIGJlIHJlbW92ZWQ/CisgICAgICAgICMgSXQgc2VlbXMgaXQncyBzdGlsbCBpbiB1c2UgaW4g VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vRHVtcFJlbmRlclRyZWUuY3BwIGFzIG9mIDgv MTAvMTEuCisgICAgICAgIGNtZC5hcHBlbmQoJy0tdGVzdC1zaGVsbCcpCiAgICAgICAgIGNtZC5l eHRlbmQoc2VsZi5fd3JhcHBlcl9vcHRpb25zKCkpCiAgICAgICAgIHJldHVybiBjbWQKIAogICAg IGRlZiBzdGFydChzZWxmKToKLSAgICAgICAgIyBGSVhNRTogU2hvdWxkIGJlIGFuIGVycm9yIHRv IGNhbGwgdGhpcyBtZXRob2QgdHdpY2UuCi0gICAgICAgIGNtZCA9IHNlbGYuY21kX2xpbmUoKQot Ci0gICAgICAgICMgV2UgbmVlZCB0byBwYXNzIGNsb3NlX2Zkcz1UcnVlIHRvIHdvcmsgYXJvdW5k IFB5dGhvbiBidWcgIzIzMjAKLSAgICAgICAgIyAob3RoZXJ3aXNlIHdlIGNhbiBoYW5nIHdoZW4g d2Uga2lsbCBEdW1wUmVuZGVyVHJlZSB3aGVuIHdlIGFyZSBydW5uaW5nCi0gICAgICAgICMgbXVs dGlwbGUgdGhyZWFkcykuIFNlZSBodHRwOi8vYnVncy5weXRob24ub3JnL2lzc3VlMjMyMCAuCi0g ICAgICAgICMgTm90ZSB0aGF0IGNsb3NlX2ZkcyBpc24ndCBzdXBwb3J0ZWQgb24gV2luZG93cywg YnV0IHRoaXMgYnVnIG9ubHkKLSAgICAgICAgIyBzaG93cyB1cCBvbiBNYWMgYW5kIExpbnV4Lgot ICAgICAgICBjbG9zZV9mbGFnID0gc3lzLnBsYXRmb3JtIG5vdCBpbiAoJ3dpbjMyJywgJ2N5Z3dp bicpCi0gICAgICAgIHNlbGYuX3Byb2MgPSBzdWJwcm9jZXNzLlBvcGVuKGNtZCwgc3RkaW49c3Vi cHJvY2Vzcy5QSVBFLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGRv dXQ9c3VicHJvY2Vzcy5QSVBFLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBzdGRlcnI9c3VicHJvY2Vzcy5TVERPVVQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNsb3NlX2Zkcz1jbG9zZV9mbGFnKQorICAgICAgICBhc3NlcnQgbm90IHNlbGYu X3Byb2MKKyAgICAgICAgIyBGSVhNRTogVGhpcyBzaG91bGQgdXNlIFNlcnZlclByb2Nlc3MgbGlr ZSBXZWJLaXREcml2ZXIgZG9lcy4KKyAgICAgICAgIyBGSVhNRTogV2Ugc2hvdWxkIGJlIHJlYWRp bmcgc3RkZXJyIGFuZCBzdGRvdXQgc2VwYXJhdGVseSBsaWtlIGhvdyBXZWJLaXREcml2ZXIgZG9l cy4KKyAgICAgICAgc2VsZi5fcHJvYyA9IHN1YnByb2Nlc3MuUG9wZW4oc2VsZi5jbWRfbGluZSgp LCBzdGRpbj1zdWJwcm9jZXNzLlBJUEUsIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUsIHN0ZGVycj1z dWJwcm9jZXNzLlNURE9VVCkKIAogICAgIGRlZiBwb2xsKHNlbGYpOgogICAgICAgICByZXR1cm4g c2VsZi5fcHJvYy5wb2xsKCkKQEAgLTQ4MiwxMCArNDcwLDggQEAgY2xhc3MgQ2hyb21pdW1Ecml2 ZXIoRHJpdmVyKToKICAgICAgICAgcmV0dXJuIGNtZAogCiAgICAgZGVmIF9vdXRwdXRfaW1hZ2Uo c2VsZik6Ci0gICAgICAgICIiIlJldHVybnMgdGhlIGltYWdlIG91dHB1dCB3aGljaCBkcml2ZXIg Z2VuZXJhdGVkLiIiIgotICAgICAgICBwbmdfcGF0aCA9IHNlbGYuX2ltYWdlX3BhdGgKLSAgICAg ICAgaWYgcG5nX3BhdGggYW5kIHNlbGYuX3BvcnQuX2ZpbGVzeXN0ZW0uZXhpc3RzKHBuZ19wYXRo KToKLSAgICAgICAgICAgIHJldHVybiBzZWxmLl9wb3J0Ll9maWxlc3lzdGVtLnJlYWRfYmluYXJ5 X2ZpbGUocG5nX3BhdGgpCisgICAgICAgIGlmIHNlbGYuX2ltYWdlX3BhdGggYW5kIHNlbGYuX3Bv cnQuX2ZpbGVzeXN0ZW0uZXhpc3RzKHNlbGYuX2ltYWdlX3BhdGgpOgorICAgICAgICAgICAgcmV0 dXJuIHNlbGYuX3BvcnQuX2ZpbGVzeXN0ZW0ucmVhZF9iaW5hcnlfZmlsZShzZWxmLl9pbWFnZV9w YXRoKQogICAgICAgICByZXR1cm4gTm9uZQogCiAgICAgZGVmIF9vdXRwdXRfaW1hZ2Vfd2l0aF9y ZXRyeShzZWxmKToKQEAgLTQ5MywyMCArNDc5LDIwIEBAIGNsYXNzIENocm9taXVtRHJpdmVyKERy aXZlcik6CiAgICAgICAgICMgcmFpc2luZyAiSU9FcnJvcjogW0Vycm5vIDEzXSBQZXJtaXNzaW9u IGRlbmllZDoiCiAgICAgICAgIHJldHJ5X251bSA9IDUwCiAgICAgICAgIHRpbWVvdXRfc2Vjb25k cyA9IDUuMAotICAgICAgICBmb3IgaSBpbiByYW5nZShyZXRyeV9udW0pOgorICAgICAgICBmb3Ig XyBpbiByYW5nZShyZXRyeV9udW0pOgogICAgICAgICAgICAgdHJ5OgogICAgICAgICAgICAgICAg IHJldHVybiBzZWxmLl9vdXRwdXRfaW1hZ2UoKQogICAgICAgICAgICAgZXhjZXB0IElPRXJyb3Is IGU6Ci0gICAgICAgICAgICAgICAgaWYgZS5lcnJubyA9PSBlcnJuby5FQUNDRVM6Ci0gICAgICAg ICAgICAgICAgICAgIHRpbWUuc2xlZXAodGltZW91dF9zZWNvbmRzIC8gcmV0cnlfbnVtKQotICAg ICAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgaWYgZS5lcnJubyAhPSBlcnJuby5F QUNDRVM6CiAgICAgICAgICAgICAgICAgICAgIHJhaXNlIGUKKyAgICAgICAgICAgICMgRklYTUU6 IFdlIHNob3VsZCBoYXZlIGEgc2VwYXJhdGUgcmV0cnkgZGVsYXkuCisgICAgICAgICAgICAjIFRo aXMgaW1wbGVtZW50YXRpb24gaXMgbGlrZWx5IHRvIGV4Y2VlZCB0aGUgdGltZW91dCBiZWZvcmUg dGhlIGV4cGVjdGVkIG51bWJlciBvZiByZXRyaWVzLgorICAgICAgICAgICAgdGltZS5zbGVlcCh0 aW1lb3V0X3NlY29uZHMgLyByZXRyeV9udW0pCiAgICAgICAgIHJldHVybiBzZWxmLl9vdXRwdXRf aW1hZ2UoKQogCiAgICAgZGVmIF9jbGVhcl9vdXRwdXRfaW1hZ2Uoc2VsZik6Ci0gICAgICAgIHBu Z19wYXRoID0gc2VsZi5faW1hZ2VfcGF0aAotICAgICAgICBpZiBwbmdfcGF0aCBhbmQgc2VsZi5f cG9ydC5fZmlsZXN5c3RlbS5leGlzdHMocG5nX3BhdGgpOgotICAgICAgICAgICAgc2VsZi5fcG9y dC5fZmlsZXN5c3RlbS5yZW1vdmUocG5nX3BhdGgpCisgICAgICAgIGlmIHNlbGYuX2ltYWdlX3Bh dGggYW5kIHNlbGYuX3BvcnQuX2ZpbGVzeXN0ZW0uZXhpc3RzKHNlbGYuX2ltYWdlX3BhdGgpOgor ICAgICAgICAgICAgc2VsZi5fcG9ydC5fZmlsZXN5c3RlbS5yZW1vdmUoc2VsZi5faW1hZ2VfcGF0 aCkKIAogICAgIGRlZiBydW5fdGVzdChzZWxmLCBkcml2ZXJfaW5wdXQpOgogICAgICAgICBvdXRw dXQgPSBbXQpAQCAtNTQ1LDEwICs1MzEsOCBAQCBjbGFzcyBDaHJvbWl1bURyaXZlcihEcml2ZXIp OgogICAgICAgICAgICAgICAgIGFjdHVhbF91cmkgPSBsaW5lLnJzdHJpcCgpWzU6XQogICAgICAg ICAgICAgICAgIGlmIHVyaSAhPSBhY3R1YWxfdXJpOgogICAgICAgICAgICAgICAgICAgICAjIEdV UkwgY2FwaXRhbGl6ZXMgdGhlIGRyaXZlIGxldHRlciBvZiBhIGZpbGUgVVJMLgotICAgICAgICAg ICAgICAgICAgICBpZiAobm90IHJlLnNlYXJjaCgiXmZpbGU6Ly8vW2Etel06IiwgdXJpKSBvcgot ICAgICAgICAgICAgICAgICAgICAgICAgdXJpLmxvd2VyKCkgIT0gYWN0dWFsX3VyaS5sb3dlcigp KToKLSAgICAgICAgICAgICAgICAgICAgICAgIF9sb2cuZmF0YWwoIlRlc3QgZ290IG91dCBvZiBz eW5jOlxufCVzfFxufCVzfCIgJQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAo dXJpLCBhY3R1YWxfdXJpKSkKKyAgICAgICAgICAgICAgICAgICAgaWYgKG5vdCByZS5zZWFyY2go Il5maWxlOi8vL1thLXpdOiIsIHVyaSkgb3IgdXJpLmxvd2VyKCkgIT0gYWN0dWFsX3VyaS5sb3dl cigpKToKKyAgICAgICAgICAgICAgICAgICAgICAgIF9sb2cuZmF0YWwoIlRlc3QgZ290IG91dCBv ZiBzeW5jOlxufCVzfFxufCVzfCIgJSAodXJpLCBhY3R1YWxfdXJpKSkKICAgICAgICAgICAgICAg ICAgICAgICAgIHJhaXNlIEFzc2VydGlvbkVycm9yKCJ0ZXN0IG91dCBvZiBzeW5jIikKICAgICAg ICAgICAgIGVsaWYgbGluZS5zdGFydHN3aXRoKCIjTUQ1OiIpOgogICAgICAgICAgICAgICAgIGFj dHVhbF9jaGVja3N1bSA9IGxpbmUucnN0cmlwKClbNTpdCkBAIC01ODcsMjMgKzU3MSwyNSBAQCBj bGFzcyBDaHJvbWl1bURyaXZlcihEcml2ZXIpOgogICAgICAgICAgICAgY3Jhc2g9Y3Jhc2gsIHRl c3RfdGltZT1ydW5fdGltZSwgdGltZW91dD10aW1lb3V0LCBlcnJvcj0nJy5qb2luKGVycm9yKSkK IAogICAgIGRlZiBzdG9wKHNlbGYpOgotICAgICAgICBpZiBzZWxmLl9wcm9jOgotICAgICAgICAg ICAgc2VsZi5fcHJvYy5zdGRpbi5jbG9zZSgpCi0gICAgICAgICAgICBzZWxmLl9wcm9jLnN0ZG91 dC5jbG9zZSgpCi0gICAgICAgICAgICBpZiBzZWxmLl9wcm9jLnN0ZGVycjoKLSAgICAgICAgICAg ICAgICBzZWxmLl9wcm9jLnN0ZGVyci5jbG9zZSgpCi0gICAgICAgICAgICAjIENsb3Npbmcgc3Rk aW4vc3Rkb3V0L3N0ZGVyciBoYW5ncyBzb21ldGltZXMgb24gT1MgWCwKLSAgICAgICAgICAgICMg KHNlZSBfX2luaXRfXygpLCBhYm92ZSksIGFuZCBhbnl3YXkgd2UgZG9uJ3Qgd2FudCB0byBoYW5n Ci0gICAgICAgICAgICAjIHRoZSBoYXJuZXNzIGlmIERSVCBpcyBidWdneSwgc28gd2Ugd2FpdCBh IGNvdXBsZQotICAgICAgICAgICAgIyBzZWNvbmRzIHRvIGdpdmUgRFJUIGEgY2hhbmNlIHRvIGNs ZWFuIHVwLCBidXQgdGhlbgotICAgICAgICAgICAgIyBmb3JjZS1raWxsIHRoZSBwcm9jZXNzIGlm IG5lY2Vzc2FyeS4KLSAgICAgICAgICAgIHRpbWVvdXQgPSB0aW1lLnRpbWUoKSArIHNlbGYuS0lM TF9USU1FT1VUCi0gICAgICAgICAgICB3aGlsZSBzZWxmLl9wcm9jLnBvbGwoKSBpcyBOb25lIGFu ZCB0aW1lLnRpbWUoKSA8IHRpbWVvdXQ6Ci0gICAgICAgICAgICAgICAgdGltZS5zbGVlcCgwLjEp Ci0gICAgICAgICAgICBpZiBzZWxmLl9wcm9jLnBvbGwoKSBpcyBOb25lOgotICAgICAgICAgICAg ICAgIF9sb2cud2FybmluZygnc3RvcHBpbmcgdGVzdCBkcml2ZXIgdGltZWQgb3V0LCBraWxsaW5n IGl0JykKLSAgICAgICAgICAgICAgICBzZWxmLl9wb3J0Ll9leGVjdXRpdmUua2lsbF9wcm9jZXNz KHNlbGYuX3Byb2MucGlkKQotICAgICAgICAgICAgIyBGSVhNRTogVGhpcyBpcyBzb21ldGltZSBO b25lLiBXaGF0IGlzIHdyb25nPyBhc3NlcnQgc2VsZi5fcHJvYy5wb2xsKCkgaXMgbm90IE5vbmUK LSAgICAgICAgICAgIGlmIHNlbGYuX3Byb2MucG9sbCgpIGlzIG5vdCBOb25lOgotICAgICAgICAg ICAgICAgIHNlbGYuX3Byb2Mud2FpdCgpCi0gICAgICAgICAgICBzZWxmLl9wcm9jID0gTm9uZQor ICAgICAgICBpZiBub3Qgc2VsZi5fcHJvYzoKKyAgICAgICAgICAgIHJldHVybgorICAgICAgICAj IEZJWE1FOiBJZiB3ZSB1c2VkIFNlcnZlclByb2Nlc3MgYWxsIHRoaXMgd291bGQgaGFwcGVuIGZv ciBmcmVlIHdpdGggU2VydmVyUHJvY2VzLnN0b3AoKQorICAgICAgICBzZWxmLl9wcm9jLnN0ZGlu LmNsb3NlKCkKKyAgICAgICAgc2VsZi5fcHJvYy5zdGRvdXQuY2xvc2UoKQorICAgICAgICBpZiBz ZWxmLl9wcm9jLnN0ZGVycjoKKyAgICAgICAgICAgIHNlbGYuX3Byb2Muc3RkZXJyLmNsb3NlKCkK KyAgICAgICAgIyBDbG9zaW5nIHN0ZGluL3N0ZG91dC9zdGRlcnIgaGFuZ3Mgc29tZXRpbWVzIG9u IE9TIFgsCisgICAgICAgICMgKHNlZSBfX2luaXRfXygpLCBhYm92ZSksIGFuZCBhbnl3YXkgd2Ug ZG9uJ3Qgd2FudCB0byBoYW5nCisgICAgICAgICMgdGhlIGhhcm5lc3MgaWYgRFJUIGlzIGJ1Z2d5 LCBzbyB3ZSB3YWl0IGEgY291cGxlCisgICAgICAgICMgc2Vjb25kcyB0byBnaXZlIERSVCBhIGNo YW5jZSB0byBjbGVhbiB1cCwgYnV0IHRoZW4KKyAgICAgICAgIyBmb3JjZS1raWxsIHRoZSBwcm9j ZXNzIGlmIG5lY2Vzc2FyeS4KKyAgICAgICAgdGltZW91dCA9IHRpbWUudGltZSgpICsgc2VsZi5L SUxMX1RJTUVPVVQKKyAgICAgICAgd2hpbGUgc2VsZi5fcHJvYy5wb2xsKCkgaXMgTm9uZSBhbmQg dGltZS50aW1lKCkgPCB0aW1lb3V0OgorICAgICAgICAgICAgdGltZS5zbGVlcCgwLjEpCisgICAg ICAgIGlmIHNlbGYuX3Byb2MucG9sbCgpIGlzIE5vbmU6CisgICAgICAgICAgICBfbG9nLndhcm5p bmcoJ3N0b3BwaW5nIHRlc3QgZHJpdmVyIHRpbWVkIG91dCwga2lsbGluZyBpdCcpCisgICAgICAg ICAgICBzZWxmLl9wb3J0Ll9leGVjdXRpdmUua2lsbF9wcm9jZXNzKHNlbGYuX3Byb2MucGlkKQor ICAgICAgICAjIEZJWE1FOiBUaGlzIGlzIHNvbWV0aW1lIE5vbmUuIFdoYXQgaXMgd3Jvbmc/IGFz c2VydCBzZWxmLl9wcm9jLnBvbGwoKSBpcyBub3QgTm9uZQorICAgICAgICBpZiBzZWxmLl9wcm9j LnBvbGwoKSBpcyBub3QgTm9uZToKKyAgICAgICAgICAgIHNlbGYuX3Byb2Mud2FpdCgpCisgICAg ICAgIHNlbGYuX3Byb2MgPSBOb25lCg==