50712 2010-12-08 13:40:10 -0800 make starting the websocket server more reliable on windows 2010-12-09 00:34:30 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 tony tony abarth aroben eric webkit.review.bot yutak yuzo oldest_to_newest 318991 0 tony 2010-12-08 13:40:10 -0800 make starting the websocket server more reliable on windows 318995 1 75958 tony 2010-12-08 13:41:44 -0800 Created attachment 75958 Patch 318996 2 tony 2010-12-08 13:42:21 -0800 On the chromium win dbg(2) bot, we're seeing: File "e:\b\build\slave\Webkit_Win__dbg__2_\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\layout_package\dump_render_tree_thread.py", line 414, in _run self._start_servers_with_lock() File "e:\b\build\slave\Webkit_Win__dbg__2_\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\layout_package\dump_render_tree_thread.py", line 550, in _start_servers_with_lock self._port.start_websocket_server() File "e:\b\build\slave\Webkit_Win__dbg__2_\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\base.py", line 548, in start_websocket_server self._websocket_server.start() File "e:\b\build\slave\Webkit_Win__dbg__2_\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\websocket_server.py", line 153, in start self.remove_log_files(self._output_dir, log_prefix) File "e:\b\build\slave\Webkit_Win__dbg__2_\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_server_base.py", line 81, in remove_log_files os.remove(full_path) WindowsError: [Error 32] The process cannot access the file because it is being used by another process: 'e:\\b\\build\\slave\\Webkit_Win__dbg__2_\\build\\src\\webkit\\Debug\\..\\../../layout-test-results\\pywebsocket.ws.log-08Dec2010-020727-out.txt' No handlers could be found for logger "webkitpy.layout_tests.layout_package.dump_render_tree_thread" 319009 3 eric 2010-12-08 13:59:59 -0800 I think yuzo filed a separate bug about this. 319010 4 eric 2010-12-08 14:00:42 -0800 Why is the retry needed? What's the race here? 319011 5 tony 2010-12-08 14:03:27 -0800 (In reply to comment #4) > Why is the retry needed? What's the race here? I think on Windows, it's common for the OS to hold on to files after making system calls to delete/close the file. We do a similar thing for chromium unit tests: http://codesearch.google.com/codesearch/p?hl=en#OAMlx_jo-ck/src/base/test/test_file_util_win.cc&q=diefiledie&exact_package=chromium&l=22 319016 6 tony 2010-12-08 14:04:42 -0800 Oh, Yuta filed the bug. It's https://bugs.webkit.org/show_bug.cgi?id=50670 319054 7 75972 tony 2010-12-08 14:44:21 -0800 Created attachment 75972 Patch 319056 8 tony 2010-12-08 14:45:14 -0800 (In reply to comment #7) > Created an attachment (id=75972) [details] > Patch Per discussion on IRC, I did the following: - Moved the method into filesystem.py - Added links to other known cases of the problem - Raise an error if the retries all fail 319070 9 75972 eric 2010-12-08 15:10:50 -0800 Comment on attachment 75972 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=75972&action=review > WebKitTools/Scripts/webkitpy/common/system/filesystem.py:115 > + try: > + WindowsError > + except NameError: > + WindowsError = FileSystem._WindowsError Does this work on non-windows python? Should we even be executing this code for non-windows users? > WebKitTools/Scripts/webkitpy/common/system/filesystem.py:126 > + raise OSError("failed to delete %s" % path) Seems we should just re-raise the original WindowsError in that case, no? > WebKitTools/Scripts/webkitpy/common/system/filesystem_unittest.py:156 > + FileSystemTest._remove_failures = 2 Can this just be a local? > WebKitTools/Scripts/webkitpy/layout_tests/port/http_server_base.py:83 > + filesystem.remove(full_path) This can't work? remove is an instance method. 319089 10 75982 tony 2010-12-08 15:45:54 -0800 Created attachment 75982 Patch 319092 11 tony 2010-12-08 15:48:28 -0800 (In reply to comment #9) > Does this work on non-windows python? Should we even be executing this code for non-windows users? Yes, it tested it on Linux. I don't know. I could either check platforms and return early or make the code handle non-Windows platforms. Let me know which way you prefer (I thought this way was cleaner). > > WebKitTools/Scripts/webkitpy/common/system/filesystem.py:126 > > + raise OSError("failed to delete %s" % path) > > Seems we should just re-raise the original WindowsError in that case, no? Fixed. > > WebKitTools/Scripts/webkitpy/common/system/filesystem_unittest.py:156 > > + FileSystemTest._remove_failures = 2 > > Can this just be a local? Unfortunately, no. See http://www.python.org/dev/peps/pep-3104/. If you want, I can do the Namespace trick shown in the example instead. > > WebKitTools/Scripts/webkitpy/layout_tests/port/http_server_base.py:83 > > + filesystem.remove(full_path) > > This can't work? remove is an instance method. Sorry, fixed. 319093 12 75982 eric 2010-12-08 15:50:09 -0800 Comment on attachment 75982 Patch Seems OK. Thanks 319106 13 tony 2010-12-08 16:13:12 -0800 *** Bug 50670 has been marked as a duplicate of this bug. *** 319107 14 tony 2010-12-08 16:13:16 -0800 Committed r73563: <http://trac.webkit.org/changeset/73563> 319306 15 webkit.review.bot 2010-12-09 00:34:30 -0800 http://trac.webkit.org/changeset/73563 might have broken GTK Linux 32-bit Release and GTK Linux 64-bit Debug The following tests are not passing: fast/css/input-search-padding.html fast/css/text-input-with-webkit-border-radius.html fast/forms/box-shadow-override.html fast/forms/control-restrict-line-height.html fast/forms/input-appearance-height.html fast/forms/placeholder-pseudo-style.html fast/forms/placeholder-set-value.html fast/forms/search-cancel-button-style-sharing.html fast/forms/search-placeholder-value-changed.html fast/forms/search-rtl.html fast/forms/search-styled.html fast/forms/search-transformed.html fast/forms/search-vertical-alignment.html fast/forms/search-zoomed.html fast/forms/searchfield-heights.html 75958 2010-12-08 13:41:44 -0800 2010-12-08 14:44:18 -0800 Patch bug-50712-20101208134235.patch text/plain 5829 tony ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4MDQ5ZGJmMjhhN2ViMTk5Y2UyNmY2MDIyMGJlYzg0NWJiMGU1MDY1Li5kODIwYzNj ZTIwOTNkMDMxOWQ0NDk3ZDBkOThmYTY1YzMyNDdlNzc4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMTItMDggIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtYWtlIHN0YXJ0aW5nIHRoZSB3 ZWJzb2NrZXQgc2VydmVyIG1vcmUgcmVsaWFibGUgb24gd2luZG93cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA3MTIKKworICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxldXRpbHMucHk6CisgICAgICAgIChyZW1vdmVf ZmlsZV93aXRoX3JldHJ5KTogSGVscGVyIG1ldGhvZCB0byByZXRyeSBvbiBlcnJvciBvbiBXaW5k b3dzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxldXRpbHNf dW5pdHRlc3QucHk6IEFkZGVkLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvaHR0cF9zZXJ2ZXJfYmFzZS5weTogVXNlIHJlbW92ZV9maWxlX3dpdGhfcmV0cnkK KwogMjAxMC0xMi0wOCAgQW50b25pbyBHb21lcyAgPGFnb21lc0ByaW0uY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNvbi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxldXRpbHMucHkgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZmlsZXV0aWxzLnB5CmluZGV4IDU1ODIxZjgz NTgzOGRmZTM1NjhkNzU1MDdkZDlhMjI0MTE0YzZjNjcuLmRiYWEyOGI1Yjk2MmFlNzNiY2U5ZmJj MzAwYTBiY2ZlNzAzMDg3MTEgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL3N5c3RlbS9maWxldXRpbHMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGV1dGlscy5weQpAQCAtMjAsOCArMjAsMTggQEAKICMg T1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFO WSBXQVkgT1VUIE9GIFRIRSBVU0UKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAoraW1wb3J0IGV4Y2VwdGlvbnMK K2ltcG9ydCBsb2dnaW5nCitpbXBvcnQgb3MKIGltcG9ydCBzeXMKK2ltcG9ydCB0aW1lCiAKK19s b2cgPSBsb2dnaW5nLmdldExvZ2dlcigid2Via2l0cHkuY29tbW9uLnN5c3RlbS5maWxldXRpbHMi KQorCisKK2NsYXNzIF9XaW5kb3dzRXJyb3IoZXhjZXB0aW9ucy5PU0Vycm9yKToKKyAgICAiIiJG YWtlIGV4Y2VwdGlvbiBmb3IgTGludXggYW5kIE1hYy4iIiIKKyAgICBwYXNzCiAKIGRlZiBtYWtl X3N0ZG91dF9iaW5hcnkoKToKICAgICAiIiJQdXRzIHN5cy5zdGRvdXQgaW50byBiaW5hcnkgbW9k ZSAob24gcGxhdGZvcm1zIHRoYXQgaGF2ZSBhIGRpc3RpbmN0aW9uCkBAIC0zMSwzICs0MSwyMiBA QCBkZWYgbWFrZV9zdGRvdXRfYmluYXJ5KCk6CiAgICAgaW1wb3J0IG1zdmNydAogICAgIGltcG9y dCBvcwogICAgIG1zdmNydC5zZXRtb2RlKHN5cy5zdGRvdXQuZmlsZW5vKCksIG9zLk9fQklOQVJZ KQorCisKK2RlZiByZW1vdmVfZmlsZV93aXRoX3JldHJ5KHBhdGgsIG9zcmVtb3ZlPW9zLnJlbW92 ZSk6CisgICAgdHJ5OgorICAgICAgICBXaW5kb3dzRXJyb3IKKyAgICBleGNlcHQgTmFtZUVycm9y OgorICAgICAgICBXaW5kb3dzRXJyb3IgPSBfV2luZG93c0Vycm9yCisKKyAgICByZXRyeV90aW1l b3V0X3NlYyA9IDMuMAorICAgIHNsZWVwX2ludGVydmFsID0gMC4xCisgICAgd2hpbGUgcmV0cnlf dGltZW91dF9zZWMgPiAwOgorICAgICAgICB0cnk6CisgICAgICAgICAgICBvc3JlbW92ZShwYXRo KQorICAgICAgICAgICAgcmV0dXJuIFRydWUKKyAgICAgICAgZXhjZXB0IFdpbmRvd3NFcnJvcjoK KyAgICAgICAgICAgIHRpbWUuc2xlZXAoc2xlZXBfaW50ZXJ2YWwpCisgICAgICAgICAgICByZXRy eV90aW1lb3V0X3NlYyAtPSBzbGVlcF9pbnRlcnZhbAorICAgIF9sb2cud2FybmluZygiZmFpbGVk IHRvIGRlbGV0ZSAlcyIgJSBwYXRoKQorICAgIHJldHVybiBGYWxzZQpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGV1dGlsc191bml0dGVz dC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxldXRp bHNfdW5pdHRlc3QucHkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOTczN2JiNTk5OTE1ODk3N2MwOWNkODNjMWU5YzYy YTY0YmFhNDBjNwotLS0gL2Rldi9udWxsCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL3N5c3RlbS9maWxldXRpbHNfdW5pdHRlc3QucHkKQEAgLTAsMCArMSw1MCBAQAor IyBDb3B5cmlnaHQgKGMpIDIwMTAsIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisj CisjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAorIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisjIG1ldDoKKyMKKyMgICAgICogUmVkaXN0 cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQK KyMgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyLgorIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXBy b2R1Y2UgdGhlIGFib3ZlCisjIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyMgaW4gdGhlIGRvY3VtZW50YXRpb24g YW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorIyBkaXN0cmlidXRpb24u CisjICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBv ZiBpdHMKKyMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBw cm9kdWN0cyBkZXJpdmVkIGZyb20KKyMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHBy aW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBC WSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMgSVMiIEFORCBB TlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorIyBM SU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IKKyMgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5P IEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJ QUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQRUNJQUwsIEVY RU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyMg TElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsg TE9TUyBPRiBVU0UsCisjIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElP TikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVU SEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcg TkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVT RQorIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLgorCitpbXBvcnQgb3MKK2ltcG9ydCB0ZW1wZmlsZQoraW1wb3J0IHVu aXR0ZXN0CisKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbSBpbXBvcnQgZmlsZXV0aWxzCisK KworY2xhc3MgRmlsZXV0aWxzVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CisgICAgZGVmIHRlc3Rf cmVtb3ZlX2ZpbGVfd2l0aF9yZXRyeShzZWxmKToKKyAgICAgICAgRmlsZXV0aWxzVGVzdC5fcmVt b3ZlX2ZhaWx1cmVzID0gMgorCisgICAgICAgIGRlZiByZW1vdmVfd2l0aF9leGNlcHRpb24oZmls ZW5hbWUpOgorICAgICAgICAgICAgRmlsZXV0aWxzVGVzdC5fcmVtb3ZlX2ZhaWx1cmVzIC09IDEK KyAgICAgICAgICAgIGlmIEZpbGV1dGlsc1Rlc3QuX3JlbW92ZV9mYWlsdXJlcyA+PSAwOgorICAg ICAgICAgICAgICAgIHRyeToKKyAgICAgICAgICAgICAgICAgICAgcmFpc2UgV2luZG93c0Vycm9y CisgICAgICAgICAgICAgICAgZXhjZXB0IE5hbWVFcnJvcjoKKyAgICAgICAgICAgICAgICAgICAg cmFpc2UgZmlsZXV0aWxzLl9XaW5kb3dzRXJyb3IKKworICAgICAgICBzZWxmLmFzc2VydFRydWUo ZmlsZXV0aWxzLnJlbW92ZV9maWxlX3dpdGhfcmV0cnkoJ2ZpbGVuYW1lJywKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlbW92ZV93aXRo X2V4Y2VwdGlvbikpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKC0xLCBGaWxldXRpbHNUZXN0 Ll9yZW1vdmVfZmFpbHVyZXMpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2h0dHBfc2VydmVyX2Jhc2UucHkgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2h0dHBfc2VydmVyX2Jhc2UucHkKaW5k ZXggMjc0NWNjZTQ0ZDRhMzE2MmQ0NWRlMmE4MmVjYjlkNGMzMjI3ZDI2OC4uMGNkZWExMDMwNjY2 NmNmNDliMjg2ZDYwYzQ4OTZiMjdmYTZkNDgzYyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9odHRwX3NlcnZlcl9iYXNlLnB5CisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvaHR0cF9zZXJ2 ZXJfYmFzZS5weQpAQCAtMzQsNiArMzQsOCBAQCBpbXBvcnQgb3MKIGltcG9ydCB0aW1lCiBpbXBv cnQgdXJsbGliCiAKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbSBpbXBvcnQgZmlsZXV0aWxz CisKIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcigid2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQu aHR0cF9zZXJ2ZXJfYmFzZSIpCiAKIApAQCAtNzgsNCArODAsNCBAQCBjbGFzcyBIdHRwU2VydmVy QmFzZShvYmplY3QpOgogICAgICAgICBmb3IgZmlsZSBpbiBmaWxlczoKICAgICAgICAgICAgIGlm IGZpbGUuc3RhcnRzd2l0aChzdGFydHNfd2l0aCk6CiAgICAgICAgICAgICAgICAgZnVsbF9wYXRo ID0gb3MucGF0aC5qb2luKGZvbGRlciwgZmlsZSkKLSAgICAgICAgICAgICAgICBvcy5yZW1vdmUo ZnVsbF9wYXRoKQorICAgICAgICAgICAgICAgIGZpbGV1dGlscy5yZW1vdmVfZmlsZV93aXRoX3Jl dHJ5KGZ1bGxfcGF0aCkK 75972 2010-12-08 14:44:21 -0800 2010-12-08 15:45:50 -0800 Patch bug-50712-20101208144512.patch text/plain 4778 tony ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4MDQ5ZGJmMjhhN2ViMTk5Y2UyNmY2MDIyMGJlYzg0NWJiMGU1MDY1Li4wN2Y4Y2Nj YzZiMGRiMzIxYThjNjFkY2ExNDEwMWRmZGY1OWVkMzA4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMTItMDggIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtYWtlIHN0YXJ0aW5nIHRoZSB3 ZWJzb2NrZXQgc2VydmVyIG1vcmUgcmVsaWFibGUgb24gd2luZG93cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA3MTIKKworICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtLnB5OgorICAgICAgICAocmVtb3Zl KTogU3Vic3RpdHV0ZSBtZXRob2QgZm9yIG9zLnJlbW92ZSB0byByZXRyeSBvbiBlcnJvciBvbiBX aW5kb3dzCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0 ZW1fdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9odHRwX3NlcnZlcl9iYXNlLnB5OiBVc2UgRmlsZVN5c3RlbS5yZW1vdmUKKwogMjAxMC0x Mi0wOCAgQW50b25pbyBHb21lcyAgPGFnb21lc0ByaW0uY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IE1hcnRpbiBSb2JpbnNvbi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW0ucHkKaW5kZXggOGYzOTZjNGI3YzkzZjcy MmRmNDQ2N2RkZThhMzkyNzhkODFkMTQ5Ny4uOTNlNWViYzgyNWFmYmY0YTI3YjJhOGRmMzkzMzI1 MDJkYWE4NGQ5OSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vc3lzdGVtL2ZpbGVzeXN0ZW0ucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW0ucHkKQEAgLTMyLDEwICszMiwxMSBAQCBmcm9tIF9f ZnV0dXJlX18gaW1wb3J0IHdpdGhfc3RhdGVtZW50CiAKIGltcG9ydCBjb2RlY3MKIGltcG9ydCBl cnJubworaW1wb3J0IGV4Y2VwdGlvbnMKIGltcG9ydCBvcwogaW1wb3J0IHNodXRpbAogaW1wb3J0 IHRlbXBmaWxlCi0KK2ltcG9ydCB0aW1lCiAKIGNsYXNzIEZpbGVTeXN0ZW0ob2JqZWN0KToKICAg ICAiIiJGaWxlU3lzdGVtIGludGVyZmFjZSBmb3Igd2Via2l0cHkuCkBAIC05Nyw2ICs5OCwzMyBA QCBjbGFzcyBGaWxlU3lzdGVtKG9iamVjdCk6CiAgICAgICAgICAgICBpZiBlLmVycm5vICE9IGVy cm5vLkVFWElTVDoKICAgICAgICAgICAgICAgICByYWlzZQogCisgICAgY2xhc3MgX1dpbmRvd3NF cnJvcihleGNlcHRpb25zLk9TRXJyb3IpOgorICAgICAgICAiIiJGYWtlIGV4Y2VwdGlvbiBmb3Ig TGludXggYW5kIE1hYy4iIiIKKyAgICAgICAgcGFzcworCisgICAgZGVmIHJlbW92ZShzZWxmLCBw YXRoLCBvc3JlbW92ZT1vcy5yZW1vdmUpOgorICAgICAgICAiIiJPbiBXaW5kb3dzLCBvcy5yZW1v dmUgY2FuIHNvbWV0aW1lcyBmYWlsLiAgV2Ugc2VlIHRoaXMgYmVoYXZpb3IgaW4KKyAgICAgICAg Q2hyb21pdW0gdGVzdHMgYXMgd2VsbCBhbmQgYXJlIHVuc3VyZSB3aHkuICBPdGhlcnMgb24gdGhl IGludGVybmV0IGFyZQorICAgICAgICBlcXVhbGx5IGNvbmZ1c2VkOgorICAgICAgICBodHRwOi8v c29jaWFsLm1zZG4ubWljcm9zb2Z0LmNvbS9Gb3J1bXMvZW4vd2luZG93c3NlYXJjaC90aHJlYWQv NTU1ODJkOWQtNzdlYS00N2Q5LTkxY2UtY2ZmN2NhN2VmNTI4CisgICAgICAgIGh0dHA6Ly9jb2Rl c2VhcmNoLmdvb2dsZS5jb20vY29kZXNlYXJjaC9wP2hsPWVuI09BTWx4X2pvLWNrL3NyYy9iYXNl L3Rlc3QvdGVzdF9maWxlX3V0aWxfd2luLmNjJnE9ZGllZmlsZWRpZSZleGFjdF9wYWNrYWdlPWNo cm9taXVtJmw9MjIKKyAgICAgICAgIiIiCisgICAgICAgIHRyeToKKyAgICAgICAgICAgIFdpbmRv d3NFcnJvcgorICAgICAgICBleGNlcHQgTmFtZUVycm9yOgorICAgICAgICAgICAgV2luZG93c0Vy cm9yID0gRmlsZVN5c3RlbS5fV2luZG93c0Vycm9yCisKKyAgICAgICAgcmV0cnlfdGltZW91dF9z ZWMgPSAzLjAKKyAgICAgICAgc2xlZXBfaW50ZXJ2YWwgPSAwLjEKKyAgICAgICAgd2hpbGUgcmV0 cnlfdGltZW91dF9zZWMgPiAwOgorICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgIG9z cmVtb3ZlKHBhdGgpCisgICAgICAgICAgICAgICAgcmV0dXJuIFRydWUKKyAgICAgICAgICAgIGV4 Y2VwdCBXaW5kb3dzRXJyb3I6CisgICAgICAgICAgICAgICAgdGltZS5zbGVlcChzbGVlcF9pbnRl cnZhbCkKKyAgICAgICAgICAgICAgICByZXRyeV90aW1lb3V0X3NlYyAtPSBzbGVlcF9pbnRlcnZh bAorICAgICAgICByYWlzZSBPU0Vycm9yKCJmYWlsZWQgdG8gZGVsZXRlICVzIiAlIHBhdGgpCisK ICAgICBkZWYgcmVhZF9iaW5hcnlfZmlsZShzZWxmLCBwYXRoKToKICAgICAgICAgIiIiUmV0dXJu IHRoZSBjb250ZW50cyBvZiB0aGUgZmlsZSBhdCB0aGUgZ2l2ZW4gcGF0aCBhcyBhIGJ5dGUgc3Ry aW5nLiIiIgogICAgICAgICB3aXRoIGZpbGUocGF0aCwgJ3JiJykgYXMgZjoKZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtX3Vu aXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2Zp bGVzeXN0ZW1fdW5pdHRlc3QucHkKaW5kZXggOTU2ODRiNzM1NTA2NGFkNWEyM2ZiNTM3MjMyNWE5 YTRjNmI3NTQ3ZC4uMjY3Y2ExM2Q3NTM3YmViNDFhNTQxYzhiYTY4ZGQ2OTMzNDY2MWQwNiAxMDA2 NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVz eXN0ZW1fdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vc3lzdGVtL2ZpbGVzeXN0ZW1fdW5pdHRlc3QucHkKQEAgLTE1Miw2ICsxNTIsMjEgQEAgY2xh c3MgRmlsZVN5c3RlbVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBmcyA9IEZpbGVT eXN0ZW0oKQogICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhJT0Vycm9yLCBmcy5yZWFkX3RleHRf ZmlsZSwgc2VsZi5fbWlzc2luZ19maWxlKQogCisgICAgZGVmIHRlc3RfcmVtb3ZlX2ZpbGVfd2l0 aF9yZXRyeShzZWxmKToKKyAgICAgICAgRmlsZVN5c3RlbVRlc3QuX3JlbW92ZV9mYWlsdXJlcyA9 IDIKKworICAgICAgICBkZWYgcmVtb3ZlX3dpdGhfZXhjZXB0aW9uKGZpbGVuYW1lKToKKyAgICAg ICAgICAgIEZpbGVTeXN0ZW1UZXN0Ll9yZW1vdmVfZmFpbHVyZXMgLT0gMQorICAgICAgICAgICAg aWYgRmlsZVN5c3RlbVRlc3QuX3JlbW92ZV9mYWlsdXJlcyA+PSAwOgorICAgICAgICAgICAgICAg IHRyeToKKyAgICAgICAgICAgICAgICAgICAgcmFpc2UgV2luZG93c0Vycm9yCisgICAgICAgICAg ICAgICAgZXhjZXB0IE5hbWVFcnJvcjoKKyAgICAgICAgICAgICAgICAgICAgcmFpc2UgRmlsZVN5 c3RlbS5fV2luZG93c0Vycm9yCisKKyAgICAgICAgZnMgPSBGaWxlU3lzdGVtKCkKKyAgICAgICAg c2VsZi5hc3NlcnRUcnVlKGZzLnJlbW92ZSgnZmlsZW5hbWUnLCByZW1vdmVfd2l0aF9leGNlcHRp b24pKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscygtMSwgRmlsZVN5c3RlbVRlc3QuX3JlbW92 ZV9mYWlsdXJlcykKKwogCiBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAgIHVuaXR0ZXN0 Lm1haW4oKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9odHRwX3NlcnZlcl9iYXNlLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9odHRwX3NlcnZlcl9iYXNlLnB5CmluZGV4IDI3NDVjY2U0 NGQ0YTMxNjJkNDVkZTJhODJlY2I5ZDRjMzIyN2QyNjguLjBlYjU1OWE5OTI2MjJlZmQxMjcyNTBl MDNjZWQ3NWIwZGRmM2VmNWYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvaHR0cF9zZXJ2ZXJfYmFzZS5weQorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2h0dHBfc2VydmVyX2Jhc2UucHkK QEAgLTM0LDYgKzM0LDggQEAgaW1wb3J0IG9zCiBpbXBvcnQgdGltZQogaW1wb3J0IHVybGxpYgog Citmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0gaW1wb3J0IGZpbGVzeXN0ZW0KKwogX2xvZyA9 IGxvZ2dpbmcuZ2V0TG9nZ2VyKCJ3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydC5odHRwX3NlcnZl cl9iYXNlIikKIAogCkBAIC03OCw0ICs4MCw0IEBAIGNsYXNzIEh0dHBTZXJ2ZXJCYXNlKG9iamVj dCk6CiAgICAgICAgIGZvciBmaWxlIGluIGZpbGVzOgogICAgICAgICAgICAgaWYgZmlsZS5zdGFy dHN3aXRoKHN0YXJ0c193aXRoKToKICAgICAgICAgICAgICAgICBmdWxsX3BhdGggPSBvcy5wYXRo LmpvaW4oZm9sZGVyLCBmaWxlKQotICAgICAgICAgICAgICAgIG9zLnJlbW92ZShmdWxsX3BhdGgp CisgICAgICAgICAgICAgICAgZmlsZXN5c3RlbS5yZW1vdmUoZnVsbF9wYXRoKQo= 75982 2010-12-08 15:45:54 -0800 2010-12-08 15:50:09 -0800 Patch bug-50712-20101208154644.patch text/plain 4796 tony ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4MDQ5ZGJmMjhhN2ViMTk5Y2UyNmY2MDIyMGJlYzg0NWJiMGU1MDY1Li4wN2Y4Y2Nj YzZiMGRiMzIxYThjNjFkY2ExNDEwMWRmZGY1OWVkMzA4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMTItMDggIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtYWtlIHN0YXJ0aW5nIHRoZSB3 ZWJzb2NrZXQgc2VydmVyIG1vcmUgcmVsaWFibGUgb24gd2luZG93cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA3MTIKKworICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtLnB5OgorICAgICAgICAocmVtb3Zl KTogU3Vic3RpdHV0ZSBtZXRob2QgZm9yIG9zLnJlbW92ZSB0byByZXRyeSBvbiBlcnJvciBvbiBX aW5kb3dzCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0 ZW1fdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9odHRwX3NlcnZlcl9iYXNlLnB5OiBVc2UgRmlsZVN5c3RlbS5yZW1vdmUKKwogMjAxMC0x Mi0wOCAgQW50b25pbyBHb21lcyAgPGFnb21lc0ByaW0uY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IE1hcnRpbiBSb2JpbnNvbi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW0ucHkKaW5kZXggOGYzOTZjNGI3YzkzZjcy MmRmNDQ2N2RkZThhMzkyNzhkODFkMTQ5Ny4uYTZhZDQyNWIxNTA5ZTBiMGY1M2Q2NDYzZGNiNzc4 N2ZkNGNjYzBhZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vc3lzdGVtL2ZpbGVzeXN0ZW0ucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW0ucHkKQEAgLTMyLDEwICszMiwxMSBAQCBmcm9tIF9f ZnV0dXJlX18gaW1wb3J0IHdpdGhfc3RhdGVtZW50CiAKIGltcG9ydCBjb2RlY3MKIGltcG9ydCBl cnJubworaW1wb3J0IGV4Y2VwdGlvbnMKIGltcG9ydCBvcwogaW1wb3J0IHNodXRpbAogaW1wb3J0 IHRlbXBmaWxlCi0KK2ltcG9ydCB0aW1lCiAKIGNsYXNzIEZpbGVTeXN0ZW0ob2JqZWN0KToKICAg ICAiIiJGaWxlU3lzdGVtIGludGVyZmFjZSBmb3Igd2Via2l0cHkuCkBAIC05Nyw2ICs5OCwzNCBA QCBjbGFzcyBGaWxlU3lzdGVtKG9iamVjdCk6CiAgICAgICAgICAgICBpZiBlLmVycm5vICE9IGVy cm5vLkVFWElTVDoKICAgICAgICAgICAgICAgICByYWlzZQogCisgICAgY2xhc3MgX1dpbmRvd3NF cnJvcihleGNlcHRpb25zLk9TRXJyb3IpOgorICAgICAgICAiIiJGYWtlIGV4Y2VwdGlvbiBmb3Ig TGludXggYW5kIE1hYy4iIiIKKyAgICAgICAgcGFzcworCisgICAgZGVmIHJlbW92ZShzZWxmLCBw YXRoLCBvc3JlbW92ZT1vcy5yZW1vdmUpOgorICAgICAgICAiIiJPbiBXaW5kb3dzLCBvcy5yZW1v dmUgY2FuIHNvbWV0aW1lcyBmYWlsLiAgV2Ugc2VlIHRoaXMgYmVoYXZpb3IgaW4KKyAgICAgICAg Q2hyb21pdW0gdGVzdHMgYXMgd2VsbCBhbmQgYXJlIHVuc3VyZSB3aHkuICBPdGhlcnMgb24gdGhl IGludGVybmV0IGFyZQorICAgICAgICBlcXVhbGx5IGNvbmZ1c2VkOgorICAgICAgICBodHRwOi8v c29jaWFsLm1zZG4ubWljcm9zb2Z0LmNvbS9Gb3J1bXMvZW4vd2luZG93c3NlYXJjaC90aHJlYWQv NTU1ODJkOWQtNzdlYS00N2Q5LTkxY2UtY2ZmN2NhN2VmNTI4CisgICAgICAgIGh0dHA6Ly9jb2Rl c2VhcmNoLmdvb2dsZS5jb20vY29kZXNlYXJjaC9wP2hsPWVuI09BTWx4X2pvLWNrL3NyYy9iYXNl L3Rlc3QvdGVzdF9maWxlX3V0aWxfd2luLmNjJnE9ZGllZmlsZWRpZSZleGFjdF9wYWNrYWdlPWNo cm9taXVtJmw9MjIKKyAgICAgICAgIiIiCisgICAgICAgIHRyeToKKyAgICAgICAgICAgIFdpbmRv d3NFcnJvcgorICAgICAgICBleGNlcHQgTmFtZUVycm9yOgorICAgICAgICAgICAgV2luZG93c0Vy cm9yID0gRmlsZVN5c3RlbS5fV2luZG93c0Vycm9yCisKKyAgICAgICAgcmV0cnlfdGltZW91dF9z ZWMgPSAzLjAKKyAgICAgICAgc2xlZXBfaW50ZXJ2YWwgPSAwLjEKKyAgICAgICAgd2hpbGUgVHJ1 ZToKKyAgICAgICAgICAgIHRyeToKKyAgICAgICAgICAgICAgICBvc3JlbW92ZShwYXRoKQorICAg ICAgICAgICAgICAgIHJldHVybiBUcnVlCisgICAgICAgICAgICBleGNlcHQgV2luZG93c0Vycm9y LCBlOgorICAgICAgICAgICAgICAgIHRpbWUuc2xlZXAoc2xlZXBfaW50ZXJ2YWwpCisgICAgICAg ICAgICAgICAgcmV0cnlfdGltZW91dF9zZWMgLT0gc2xlZXBfaW50ZXJ2YWwKKyAgICAgICAgICAg ICAgICBpZiByZXRyeV90aW1lb3V0X3NlYyA8IDA6CisgICAgICAgICAgICAgICAgICAgIHJhaXNl IGUKKwogICAgIGRlZiByZWFkX2JpbmFyeV9maWxlKHNlbGYsIHBhdGgpOgogICAgICAgICAiIiJS ZXR1cm4gdGhlIGNvbnRlbnRzIG9mIHRoZSBmaWxlIGF0IHRoZSBnaXZlbiBwYXRoIGFzIGEgYnl0 ZSBzdHJpbmcuIiIiCiAgICAgICAgIHdpdGggZmlsZShwYXRoLCAncmInKSBhcyBmOgpkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0 ZW1fdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0 ZW0vZmlsZXN5c3RlbV91bml0dGVzdC5weQppbmRleCA5NTY4NGI3MzU1MDY0YWQ1YTIzZmI1Mzcy MzI1YTlhNGM2Yjc1NDdkLi4yNjdjYTEzZDc1MzdiZWI0MWE1NDFjOGJhNjhkZDY5MzM0NjYxZDA2 IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0v ZmlsZXN5c3RlbV91bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbV91bml0dGVzdC5weQpAQCAtMTUyLDYgKzE1MiwyMSBA QCBjbGFzcyBGaWxlU3lzdGVtVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIGZzID0g RmlsZVN5c3RlbSgpCiAgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKElPRXJyb3IsIGZzLnJlYWRf dGV4dF9maWxlLCBzZWxmLl9taXNzaW5nX2ZpbGUpCiAKKyAgICBkZWYgdGVzdF9yZW1vdmVfZmls ZV93aXRoX3JldHJ5KHNlbGYpOgorICAgICAgICBGaWxlU3lzdGVtVGVzdC5fcmVtb3ZlX2ZhaWx1 cmVzID0gMgorCisgICAgICAgIGRlZiByZW1vdmVfd2l0aF9leGNlcHRpb24oZmlsZW5hbWUpOgor ICAgICAgICAgICAgRmlsZVN5c3RlbVRlc3QuX3JlbW92ZV9mYWlsdXJlcyAtPSAxCisgICAgICAg ICAgICBpZiBGaWxlU3lzdGVtVGVzdC5fcmVtb3ZlX2ZhaWx1cmVzID49IDA6CisgICAgICAgICAg ICAgICAgdHJ5OgorICAgICAgICAgICAgICAgICAgICByYWlzZSBXaW5kb3dzRXJyb3IKKyAgICAg ICAgICAgICAgICBleGNlcHQgTmFtZUVycm9yOgorICAgICAgICAgICAgICAgICAgICByYWlzZSBG aWxlU3lzdGVtLl9XaW5kb3dzRXJyb3IKKworICAgICAgICBmcyA9IEZpbGVTeXN0ZW0oKQorICAg ICAgICBzZWxmLmFzc2VydFRydWUoZnMucmVtb3ZlKCdmaWxlbmFtZScsIHJlbW92ZV93aXRoX2V4 Y2VwdGlvbikpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKC0xLCBGaWxlU3lzdGVtVGVzdC5f cmVtb3ZlX2ZhaWx1cmVzKQorCiAKIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6CiAgICAgdW5p dHRlc3QubWFpbigpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2h0dHBfc2VydmVyX2Jhc2UucHkgYi9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2h0dHBfc2VydmVyX2Jhc2UucHkKaW5kZXggMjc0 NWNjZTQ0ZDRhMzE2MmQ0NWRlMmE4MmVjYjlkNGMzMjI3ZDI2OC4uNTJhMDQwMzZkOGFjNDQ0MThj MDc4NzM5YWEyMmI1MTk2NzIxMDM4MCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9odHRwX3NlcnZlcl9iYXNlLnB5CisrKyBiL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvaHR0cF9zZXJ2ZXJfYmFz ZS5weQpAQCAtMzQsNiArMzQsOCBAQCBpbXBvcnQgb3MKIGltcG9ydCB0aW1lCiBpbXBvcnQgdXJs bGliCiAKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbSBpbXBvcnQgZmlsZXN5c3RlbQorCiBf bG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoIndlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0Lmh0dHBf c2VydmVyX2Jhc2UiKQogCiAKQEAgLTc4LDQgKzgwLDQgQEAgY2xhc3MgSHR0cFNlcnZlckJhc2Uo b2JqZWN0KToKICAgICAgICAgZm9yIGZpbGUgaW4gZmlsZXM6CiAgICAgICAgICAgICBpZiBmaWxl LnN0YXJ0c3dpdGgoc3RhcnRzX3dpdGgpOgogICAgICAgICAgICAgICAgIGZ1bGxfcGF0aCA9IG9z LnBhdGguam9pbihmb2xkZXIsIGZpbGUpCi0gICAgICAgICAgICAgICAgb3MucmVtb3ZlKGZ1bGxf cGF0aCkKKyAgICAgICAgICAgICAgICBmaWxlc3lzdGVtLkZpbGVTeXN0ZW0oKS5yZW1vdmUoZnVs bF9wYXRoKQo=