196905 2019-04-14 08:37:51 -0700 API test WKAttachmentTests.AddAttachmentToConnectedImageElement is a flaky failure on Mac Release builds 2019-04-14 21:47:46 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Local Build Mac All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=177484 https://bugs.webkit.org/show_bug.cgi?id=196893 https://bugs.webkit.org/show_bug.cgi?id=196909 InRadar P2 Normal --- 1 aestes wenson_hsieh aakash_jain aestes bdakin commit-queue rniwa thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1527095 0 aestes 2019-04-14 08:37:51 -0700 On macOS Mojave, in a Release build of r244241, the API test WKAttachmentTests.AddAttachmentToConnectedImageElement failed on 6 out of 10 runs of the WKAttachmentTests API test suite. It also sometimes fails on api-mac EWS bots in a way that makes it appear like a seemingly-unrelated patch regressed the test (e.g., bug #177484). Steps to reproduce: 1. Create a Mac Release build of r244241. 2. run-api-tests WKAttachmentTests. Expected results: All 31 tests pass. Actual results: On 6 out of 10 runs, WKAttachmentTests.AddAttachmentToConnectedImageElement failed. TestWebKitAPI.WKAttachmentTests.AddAttachmentToConnectedImageElement _RegisterApplication(), FAILED TO establish the default connection to the WindowServer, _CGSDefaultConnection() is NULL. 2019-04-14 08:23:20.508 TestWebKitAPI[59497:767481] Expected inserted attachments: ( ) to match ( "<_WKAttachment 0x7fbcc7d01340 id='2414efeb-bbf1-4650-83ce-a167b0a11484'>" ). /Volumes/Data/Projects/OpenSource/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm:150 Value of: insertedAttachmentsMatch Actual: false Expected: true 1527101 1 webkit-bug-importer 2019-04-14 09:34:26 -0700 <rdar://problem/49886096> 1527118 2 aakash_jain 2019-04-14 15:47:37 -0700 This flaky test is slowing down EWS (since EWS has to re-run API tests few times to confirm that the failure is not because of the patch being tested). e.g.: https://ews-build.webkit.org/#/builders/3/builds/535 https://ews-build.webkit.org/#/builders/3/builds/530 https://ews-build.webkit.org/#/builders/3/builds/528 https://ews-build.webkit.org/#/builders/3/builds/503 https://ews-build.webkit.org/#/builders/3/builds/500 https://ews-build.webkit.org/#/builders/3/builds/467 https://ews-build.webkit.org/#/builders/3/builds/465 https://ews-build.webkit.org/#/builders/3/builds/460 https://ews-build.webkit.org/#/builders/3/builds/541 https://ews-build.webkit.org/#/builders/3/builds/527 https://ews-build.webkit.org/#/builders/3/builds/526 https://ews-build.webkit.org/#/builders/3/builds/518 https://ews-build.webkit.org/#/builders/3/builds/515 https://ews-build.webkit.org/#/builders/3/builds/509 https://ews-build.webkit.org/#/builders/3/builds/499 https://ews-build.webkit.org/#/builders/3/builds/497 https://ews-build.webkit.org/#/builders/3/builds/494 https://ews-build.webkit.org/#/builders/3/builds/493 https://ews-build.webkit.org/#/builders/3/builds/490 https://ews-build.webkit.org/#/builders/3/builds/480 https://ews-build.webkit.org/#/builders/3/builds/479 https://ews-build.webkit.org/#/builders/3/builds/477 https://ews-build.webkit.org/#/builders/3/builds/476 https://ews-build.webkit.org/#/builders/3/builds/474 https://ews-build.webkit.org/#/builders/3/builds/473 https://ews-build.webkit.org/#/builders/3/builds/470 In following builds, the test was so flaky that EWS incorrectly thought that the failure was introduced by the patch being tested (this test failed twice with the patch, and didn't fail on clean tree): https://ews-build.webkit.org/#/builders/3/builds/542 https://ews-build.webkit.org/#/builders/3/builds/546 https://ews-build.webkit.org/#/builders/3/builds/512 https://ews-build.webkit.org/#/builders/3/builds/495 https://ews-build.webkit.org/#/builders/3/builds/492 https://ews-build.webkit.org/#/builders/3/builds/488 https://ews-build.webkit.org/#/builders/3/builds/484 https://ews-build.webkit.org/#/builders/3/builds/471 https://ews-build.webkit.org/#/builders/3/builds/468 https://ews-build.webkit.org/#/builders/3/builds/464 https://ews-build.webkit.org/#/builders/3/builds/454 https://ews-build.webkit.org/#/builders/3/builds/440 https://ews-build.webkit.org/#/builders/3/builds/439 https://ews-build.webkit.org/#/builders/3/builds/429 https://ews-build.webkit.org/#/builders/3/builds/426 https://ews-build.webkit.org/#/builders/3/builds/414 Observation: This test seems to be failing/flaky since https://ews-build.webkit.org/#/builders/3/builds/414 1527123 3 wenson_hsieh 2019-04-14 16:44:26 -0700 I can't seem to hit this when running the test as-is, but this is reasonably easy to reproduce by running it in a loop like so: --- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm +++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm @@ -1348,6 +1348,8 @@ TEST(WKAttachmentTests, ChangeFileWrapperForPastedImage) TEST(WKAttachmentTests, AddAttachmentToConnectedImageElement) { + for (int i = 0; i < 50; i++) { + NSLog(@"<WK>: Running iteration: %tu", i); auto webView = webViewForTestingAttachments(); [webView _synchronouslyExecuteEditCommand:@"InsertHTML" argument:@"<img></img>"]; @@ -1370,6 +1372,7 @@ TEST(WKAttachmentTests, AddAttachmentToConnectedImageElement) [attachment synchronouslySetFileWrapper:firstImage.get() newContentType:nil error:nil]; [webView waitForImageElementSizeToBecome:CGSizeMake(215, 174)]; + } } 1527127 4 367408 wenson_hsieh 2019-04-14 18:24:51 -0700 Created attachment 367408 Patch 1527128 5 367409 wenson_hsieh 2019-04-14 18:27:38 -0700 Created attachment 367409 Add radar link to ChangeLog 1527129 6 367410 wenson_hsieh 2019-04-14 19:00:59 -0700 Created attachment 367410 Also reenable the test 1527135 7 367410 commit-queue 2019-04-14 21:47:44 -0700 Comment on attachment 367410 Also reenable the test Clearing flags on attachment: 367410 Committed r244251: <https://trac.webkit.org/changeset/244251> 1527136 8 commit-queue 2019-04-14 21:47:46 -0700 All reviewed patches have been landed. Closing bug. 367408 2019-04-14 18:24:51 -0700 2019-04-14 18:27:37 -0700 Patch bug-196905-20190414182450.patch text/plain 4353 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0MjQyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODg1MjE3ZjYxYjJhMDgxZWNjOThmZGMwYWFhZWQ3ZDVm NGY1MmM4ZC4uNjZhZjM3Yjg0YzlmMmIyODNkMzljYWNiYzczNmQxZDI3MjYwYTY4NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQy IEBACisyMDE5LTA0LTE0ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgor CisgICAgICAgIEFQSSB0ZXN0IFdLQXR0YWNobWVudFRlc3RzLkFkZEF0dGFjaG1lbnRUb0Nvbm5l Y3RlZEltYWdlRWxlbWVudCBpcyBhIGZsYWt5IGZhaWx1cmUgb24gTWFjIFJlbGVhc2UgYnVpbGRz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTY5MDUK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGZs YWt5IHRlc3QgZXhlcmNpc2VzIGEgcmFjZSBjb25kaXRpb24gYmV0d2VlbiB3aGVuIGF0dGFjaG1l bnQgaW5zZXJ0aW9uIHVwZGF0ZXMgYXJlIGRpc3BhdGNoZWQgZnJvbSB0aGUgd2ViCisgICAgICAg IHByb2Nlc3MgdG8gdGhlIFVJIHByb2Nlc3MsIGFuZCB3aGVuIHNjcmlwdCBpcyBleGVjdXRlZCB2 aWEgLVtXS1dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OmNvbXBsZXRpb25IYW5kbGVyOl0uCisg ICAgICAgIFNpbmNlIGF0dGFjaG1lbnQgaW5zZXJ0aW9uIGFuZCByZW1vdmFsIHVwZGF0ZXMgZnJv bSB0aGUgd2ViIHByb2Nlc3MgdG8gdGhlIFVJIHByb2Nlc3MgYXJlIHNjaGVkdWxlZCBvbiBhIHpl cm8tCisgICAgICAgIGRlbGF5IHRpbWVyLCB3ZSBlbmQgdXAgd2l0aCB0aGlzIHNlcXVlbmNlIG9m IGV2ZW50cyBpbiB0aGUgcHJvYmxlbWF0aWMgKGZhaWx1cmUpIGNhc2U6CisKKyAgICAgICAgKGEp IFtVSV0gICAgUnVuIHNjcmlwdCAjMSAod2hpY2ggY2FsbHMgYEhUTUxBdHRhY2htZW50RWxlbWVu dC5nZXRBdHRhY2htZW50SWRlbnRpZmllcmApCisKKyAgICAgICAgICAgIC4uLklQQyBmcm9tIFVJ IHRvIHdlYiBwcm9jZXNzLi4uCisKKyAgICAgICAgKGIpIFtXZWJdICAgRXZhbHVhdGUgc2NyaXB0 ICMxIGluIHRoZSB3ZWIgcHJvY2Vzcywgd2hpY2ggc2NoZWR1bGVzIGF0dGFjaG1lbnQgdXBkYXRl cyBvbiBhIHplcm8tZGVsYXkgdGltZXIKKworICAgICAgICAgICAgLi4uSVBDIGZyb20gd2ViIHRv IFVJIHByb2Nlc3MuLi4KKworICAgICAgICAoYykgW1VJXSAgICBJbnZva2UgY29tcGxldGlvbiBo YW5kbGVyIGZvciBzY3JpcHQgIzEKKyAgICAgICAgKGQpIFtVSV0gICAgUnVuIHNjcmlwdCAjMiAo d2hpY2ggY2FsbHMgYGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJ2ltZycpLmF0dGFjaG1lbnRJZGVu dGlmaWVyYCkKKworICAgICAgICAgICAgLi4uSVBDIGZyb20gVUkgdG8gd2ViIHByb2Nlc3MuLi4K KworICAgICAgICAoZSkgW1dlYl0gICBFdmFsdWF0ZSBzY3JpcHQgIzIgaW4gdGhlIHdlYiBwcm9j ZXNzCisgICAgICAgIChmKSBbV2ViXSAgIFplcm8tZGVsYXkgdGltZXIgZmlyZXMgYW5kIGRpc3Bh dGNoZXMgYXR0YWNobWVudCB1cGRhdGVzIHRvIHRoZSBVSSBwcm9jZXNzCisKKyAgICAgICAgLi4u d2hpY2ggbWVhbnMgdGhhdCBzY3JpcHQgIzIgd2lsbCBjb21wbGV0ZSBiZWZvcmUgdGhlIFVJIHBy b2Nlc3MgaGFzIHJlY2VpdmVkIHRoZSBhdHRhY2htZW50IHVwZGF0ZXMgc2VudCBpbgorICAgICAg ICBzdGVwIChmKS4gSG93ZXZlciwgaW4gdGhlIGNhc2Ugd2hlcmUgdGhlIGZsYWt5IHRlc3Qgc3Vj Y2VlZHMsIHRoZSB6ZXJvLWRlbGF5IHRpbWVyIGluIChmKSBmaXJlcyAqYmVmb3JlKiBzY3JpcHQK KyAgICAgICAgIzIgaXMgcnVuIGluIHN0ZXAgKGUpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggZml4 ZXMgdGhlIGZsYWt5IHRlc3QgYnkgd2FpdGluZyB1bnRpbCBhdHRhY2htZW50IGluc2VydGlvbiB1 cGRhdGVzIGFyZSBndWFyYW50ZWVkIHRvIGJlIHJlY2VpdmVkIGluCisgICAgICAgIHRoZSBVSSBw cm9jZXNzIGJ5IHdhaXRpbmcgb24gYSBzY3JpcHQgbWVzc2FnZSBwb3N0ZWQgYnkgdGhlIHdlYiBw cm9jZXNzLCBhZnRlciBhdHRhY2htZW50IHVwZGF0ZXMgYXJlCisgICAgICAgIGRpc3BhdGNoZWQu CisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQXR0YWNobWVu dFRlc3RzLm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisKIDIwMTktMDQtMTMg IFRhZGV1IFphZ2FsbG8gIDx0emFnYWxsb0BhcHBsZS5jb20+CiAKICAgICAgICAgQ29kZUNhY2hl IHNob3VsZCBjaGVjayB0aGF0IHRoZSBVbmxpbmtlZENvZGVCbG9jayB3YXMgc3VjY2Vzc2Z1bGx5 IGNyZWF0ZWQgYmVmb3JlIGNhY2hpbmcgaXQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVzdHMubW0gYi9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQXR0YWNobWVudFRlc3RzLm1tCmluZGV4IDFjMmI0 OTA3NGVkZmU2YWQ1N2I1OGJiOTAxMTU1Yzk2ZjEyNmNjZDQuLjAxYzBjMjU1ZDcwYTczNzE2MDc3 MjZiNWI5NjUwYThlOWEwNzFjOGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVzdHMubW0KKysrIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0F0dGFjaG1lbnRUZXN0cy5tbQpAQCAtMTM1MSwxMSAr MTM1MSwyMiBAQCBURVNUKFdLQXR0YWNobWVudFRlc3RzLCBBZGRBdHRhY2htZW50VG9Db25uZWN0 ZWRJbWFnZUVsZW1lbnQpCiAgICAgYXV0byB3ZWJWaWV3ID0gd2ViVmlld0ZvclRlc3RpbmdBdHRh Y2htZW50cygpOwogICAgIFt3ZWJWaWV3IF9zeW5jaHJvbm91c2x5RXhlY3V0ZUVkaXRDb21tYW5k OkAiSW5zZXJ0SFRNTCIgYXJndW1lbnQ6QCI8aW1nPjwvaW1nPiJdOwogCisgICAgX19ibG9jayBi b29sIGRvbmVXYWl0aW5nRm9yQXR0YWNobWVudEluc2VydGlvbiA9IGZhbHNlOworICAgIFt3ZWJW aWV3IHBlcmZvcm1BZnRlclJlY2VpdmluZ01lc3NhZ2U6QCJpbnNlcnRlZCIgYWN0aW9uOl57Cisg ICAgICAgIGRvbmVXYWl0aW5nRm9yQXR0YWNobWVudEluc2VydGlvbiA9IHRydWU7CisgICAgfV07 CisKKyAgICBjb25zdCBjaGFyICpzY3JpcHRGb3JFbnN1cmluZ0F0dGFjaG1lbnRJZGVudGlmaWVy ID0gXAorICAgICAgICAiY29uc3QgaWRlbnRpZmllciA9IEhUTUxBdHRhY2htZW50RWxlbWVudC5n ZXRBdHRhY2htZW50SWRlbnRpZmllcihkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCdpbWcnKSk7Igor ICAgICAgICAic2V0VGltZW91dCgoKSA9PiB3ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5k bGVyLnBvc3RNZXNzYWdlKCdpbnNlcnRlZCcpLCAwKTsiCisgICAgICAgICJpZGVudGlmaWVyIjsK KwogICAgIE9ic2VydmVBdHRhY2htZW50VXBkYXRlc0ZvclNjb3BlIG9ic2VydmVyKHdlYlZpZXcu Z2V0KCkpOwotICAgIE5TU3RyaW5nICphdHRhY2htZW50SWRlbnRpZmllciA9IFt3ZWJWaWV3IHN0 cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJIVE1MQXR0YWNobWVudEVsZW1lbnQuZ2V0QXR0 YWNobWVudElkZW50aWZpZXIoZG9jdW1lbnQucXVlcnlTZWxlY3RvcignaW1nJykpIl07CisgICAg TlNTdHJpbmcgKmF0dGFjaG1lbnRJZGVudGlmaWVyID0gW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0 aW5nSmF2YVNjcmlwdDpAKHNjcmlwdEZvckVuc3VyaW5nQXR0YWNobWVudElkZW50aWZpZXIpXTsK ICAgICBhdXRvIGF0dGFjaG1lbnQgPSByZXRhaW5QdHIoW3dlYlZpZXcgX2F0dGFjaG1lbnRGb3JJ ZGVudGlmaWVyOmF0dGFjaG1lbnRJZGVudGlmaWVyXSk7CiAgICAgRVhQRUNUX1dLX1NUUkVRKGF0 dGFjaG1lbnRJZGVudGlmaWVyLCBbYXR0YWNobWVudCB1bmlxdWVJZGVudGlmaWVyXSk7CiAgICAg RVhQRUNUX1dLX1NUUkVRKGF0dGFjaG1lbnRJZGVudGlmaWVyLCBbd2ViVmlldyBzdHJpbmdCeUV2 YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQucXVlcnlTZWxlY3RvcignaW1nJykuYXR0YWNo bWVudElkZW50aWZpZXIiXSk7CisgICAgVXRpbDo6cnVuKCZkb25lV2FpdGluZ0ZvckF0dGFjaG1l bnRJbnNlcnRpb24pOwogICAgIG9ic2VydmVyLmV4cGVjdEF0dGFjaG1lbnRVcGRhdGVzKEBbIF0s IEBbIGF0dGFjaG1lbnQuZ2V0KCkgXSk7CiAKICAgICBhdXRvIGZpcnN0SW1hZ2UgPSBhZG9wdE5T KFtbTlNGaWxlV3JhcHBlciBhbGxvY10gaW5pdFdpdGhVUkw6dGVzdEltYWdlRmlsZVVSTCgpIG9w dGlvbnM6MCBlcnJvcjpuaWxdKTsK 367409 2019-04-14 18:27:38 -0700 2019-04-14 19:00:57 -0700 Add radar link to ChangeLog bug-196905-20190414182737.patch text/plain 4376 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0MjQyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODg1MjE3ZjYxYjJhMDgxZWNjOThmZGMwYWFhZWQ3ZDVm NGY1MmM4ZC4uOWY4MjQ5YTAyNjMwMjgxNWI4ZjE4MzY0MWM5ODc1M2ZiYzc5Mzg5OCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3 IEBACisyMDE5LTA0LTE0ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgor CisgICAgICAgIEFQSSB0ZXN0IFdLQXR0YWNobWVudFRlc3RzLkFkZEF0dGFjaG1lbnRUb0Nvbm5l Y3RlZEltYWdlRWxlbWVudCBpcyBhIGZsYWt5IGZhaWx1cmUgb24gTWFjIFJlbGVhc2UgYnVpbGRz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTY5MDUK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ5ODg2MDk2PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgZmxha3kgdGVzdCBleGVyY2lzZXMgYSBy YWNlIGNvbmRpdGlvbiBiZXR3ZWVuIHdoZW4gYXR0YWNobWVudCBpbnNlcnRpb24gdXBkYXRlcyBh cmUgZGlzcGF0Y2hlZCBmcm9tIHRoZSB3ZWIKKyAgICAgICAgcHJvY2VzcyB0byB0aGUgVUkgcHJv Y2VzcywgYW5kIHdoZW4gc2NyaXB0IGlzIGV4ZWN1dGVkIHZpYSAtW1dLV2ViVmlldyBldmFsdWF0 ZUphdmFTY3JpcHQ6Y29tcGxldGlvbkhhbmRsZXI6XS4KKyAgICAgICAgU2luY2UgYXR0YWNobWVu dCBpbnNlcnRpb24gYW5kIHJlbW92YWwgdXBkYXRlcyBmcm9tIHRoZSB3ZWIgcHJvY2VzcyB0byB0 aGUgVUkgcHJvY2VzcyBhcmUgc2NoZWR1bGVkIG9uIGEgemVyby0KKyAgICAgICAgZGVsYXkgdGlt ZXIsIHdlIGVuZCB1cCB3aXRoIHRoaXMgc2VxdWVuY2Ugb2YgZXZlbnRzIGluIHRoZSBwcm9ibGVt YXRpYyAoZmFpbHVyZSkgY2FzZToKKworICAgICAgICAoYSkgW1VJXSAgICBSdW4gc2NyaXB0ICMx ICh3aGljaCBjYWxscyBgSFRNTEF0dGFjaG1lbnRFbGVtZW50LmdldEF0dGFjaG1lbnRJZGVudGlm aWVyYCkKKyAgICAgICAgICAgIC4uLklQQyBmcm9tIFVJIHRvIHdlYiBwcm9jZXNzLi4uCisgICAg ICAgIChiKSBbV2ViXSAgIEV2YWx1YXRlIHNjcmlwdCAjMSBpbiB0aGUgd2ViIHByb2Nlc3MsIHdo aWNoIHNjaGVkdWxlcyBhdHRhY2htZW50IHVwZGF0ZXMgb24gYSB6ZXJvLWRlbGF5IHRpbWVyCisg ICAgICAgICAgICAuLi5JUEMgZnJvbSB3ZWIgdG8gVUkgcHJvY2Vzcy4uLgorICAgICAgICAoYykg W1VJXSAgICBJbnZva2UgY29tcGxldGlvbiBoYW5kbGVyIGZvciBzY3JpcHQgIzEKKyAgICAgICAg KGQpIFtVSV0gICAgUnVuIHNjcmlwdCAjMiAod2hpY2ggY2FsbHMgYGRvY3VtZW50LnF1ZXJ5U2Vs ZWN0b3IoJ2ltZycpLmF0dGFjaG1lbnRJZGVudGlmaWVyYCkKKyAgICAgICAgICAgIC4uLklQQyBm cm9tIFVJIHRvIHdlYiBwcm9jZXNzLi4uCisgICAgICAgIChlKSBbV2ViXSAgIEV2YWx1YXRlIHNj cmlwdCAjMiBpbiB0aGUgd2ViIHByb2Nlc3MKKyAgICAgICAgKGYpIFtXZWJdICAgWmVyby1kZWxh eSB0aW1lciBmaXJlcyBhbmQgZGlzcGF0Y2hlcyBhdHRhY2htZW50IHVwZGF0ZXMgdG8gdGhlIFVJ IHByb2Nlc3MKKworICAgICAgICAuLi53aGljaCBtZWFucyB0aGF0IHNjcmlwdCAjMiB3aWxsIGNv bXBsZXRlIGJlZm9yZSB0aGUgVUkgcHJvY2VzcyBoYXMgcmVjZWl2ZWQgdGhlIGF0dGFjaG1lbnQg dXBkYXRlcyBzZW50IGluCisgICAgICAgIHN0ZXAgKGYpLiBIb3dldmVyLCBpbiB0aGUgY2FzZSB3 aGVyZSB0aGUgZmxha3kgdGVzdCBzdWNjZWVkcywgdGhlIHplcm8tZGVsYXkgdGltZXIgaW4gKGYp IGZpcmVzICpiZWZvcmUqIHNjcmlwdAorICAgICAgICAjMiBpcyBydW4gaW4gc3RlcCAoZSkuCisK KyAgICAgICAgVGhpcyBwYXRjaCBmaXhlcyB0aGUgZmxha3kgdGVzdCBieSB3YWl0aW5nIHVudGls IGF0dGFjaG1lbnQgaW5zZXJ0aW9uIHVwZGF0ZXMgYXJlIGd1YXJhbnRlZWQgdG8gYmUgcmVjZWl2 ZWQgaW4KKyAgICAgICAgdGhlIFVJIHByb2Nlc3MgYnkgd2FpdGluZyBvbiBhIHNjcmlwdCBtZXNz YWdlIHBvc3RlZCBieSB0aGUgd2ViIHByb2Nlc3MsIGFmdGVyIGF0dGFjaG1lbnQgdXBkYXRlcyBh cmUKKyAgICAgICAgZGlzcGF0Y2hlZC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVzdHMubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJ OjpURVNUKToKKwogMjAxOS0wNC0xMyAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv bT4KIAogICAgICAgICBDb2RlQ2FjaGUgc2hvdWxkIGNoZWNrIHRoYXQgdGhlIFVubGlua2VkQ29k ZUJsb2NrIHdhcyBzdWNjZXNzZnVsbHkgY3JlYXRlZCBiZWZvcmUgY2FjaGluZyBpdApkaWZmIC0t Z2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0F0dGFjaG1lbnRU ZXN0cy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRhY2ht ZW50VGVzdHMubW0KaW5kZXggMWMyYjQ5MDc0ZWRmZTZhZDU3YjU4YmI5MDExNTVjOTZmMTI2Y2Nk NC4uMDFjMGMyNTVkNzBhNzM3MTYwNzcyNmI1Yjk2NTBhOGU5YTA3MWM4ZiAxMDA2NDQKLS0tIGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0F0dGFjaG1lbnRUZXN0cy5t bQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQXR0YWNobWVu dFRlc3RzLm1tCkBAIC0xMzUxLDExICsxMzUxLDIyIEBAIFRFU1QoV0tBdHRhY2htZW50VGVzdHMs IEFkZEF0dGFjaG1lbnRUb0Nvbm5lY3RlZEltYWdlRWxlbWVudCkKICAgICBhdXRvIHdlYlZpZXcg PSB3ZWJWaWV3Rm9yVGVzdGluZ0F0dGFjaG1lbnRzKCk7CiAgICAgW3dlYlZpZXcgX3N5bmNocm9u b3VzbHlFeGVjdXRlRWRpdENvbW1hbmQ6QCJJbnNlcnRIVE1MIiBhcmd1bWVudDpAIjxpbWc+PC9p bWc+Il07CiAKKyAgICBfX2Jsb2NrIGJvb2wgZG9uZVdhaXRpbmdGb3JBdHRhY2htZW50SW5zZXJ0 aW9uID0gZmFsc2U7CisgICAgW3dlYlZpZXcgcGVyZm9ybUFmdGVyUmVjZWl2aW5nTWVzc2FnZTpA Imluc2VydGVkIiBhY3Rpb246XnsKKyAgICAgICAgZG9uZVdhaXRpbmdGb3JBdHRhY2htZW50SW5z ZXJ0aW9uID0gdHJ1ZTsKKyAgICB9XTsKKworICAgIGNvbnN0IGNoYXIgKnNjcmlwdEZvckVuc3Vy aW5nQXR0YWNobWVudElkZW50aWZpZXIgPSBcCisgICAgICAgICJjb25zdCBpZGVudGlmaWVyID0g SFRNTEF0dGFjaG1lbnRFbGVtZW50LmdldEF0dGFjaG1lbnRJZGVudGlmaWVyKGRvY3VtZW50LnF1 ZXJ5U2VsZWN0b3IoJ2ltZycpKTsiCisgICAgICAgICJzZXRUaW1lb3V0KCgpID0+IHdlYmtpdC5t ZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UoJ2luc2VydGVkJyksIDApOyIK KyAgICAgICAgImlkZW50aWZpZXIiOworCiAgICAgT2JzZXJ2ZUF0dGFjaG1lbnRVcGRhdGVzRm9y U2NvcGUgb2JzZXJ2ZXIod2ViVmlldy5nZXQoKSk7Ci0gICAgTlNTdHJpbmcgKmF0dGFjaG1lbnRJ ZGVudGlmaWVyID0gW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAIkhUTUxB dHRhY2htZW50RWxlbWVudC5nZXRBdHRhY2htZW50SWRlbnRpZmllcihkb2N1bWVudC5xdWVyeVNl bGVjdG9yKCdpbWcnKSkiXTsKKyAgICBOU1N0cmluZyAqYXR0YWNobWVudElkZW50aWZpZXIgPSBb d2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAoc2NyaXB0Rm9yRW5zdXJpbmdB dHRhY2htZW50SWRlbnRpZmllcildOwogICAgIGF1dG8gYXR0YWNobWVudCA9IHJldGFpblB0cihb d2ViVmlldyBfYXR0YWNobWVudEZvcklkZW50aWZpZXI6YXR0YWNobWVudElkZW50aWZpZXJdKTsK ICAgICBFWFBFQ1RfV0tfU1RSRVEoYXR0YWNobWVudElkZW50aWZpZXIsIFthdHRhY2htZW50IHVu aXF1ZUlkZW50aWZpZXJdKTsKICAgICBFWFBFQ1RfV0tfU1RSRVEoYXR0YWNobWVudElkZW50aWZp ZXIsIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5xdWVy eVNlbGVjdG9yKCdpbWcnKS5hdHRhY2htZW50SWRlbnRpZmllciJdKTsKKyAgICBVdGlsOjpydW4o JmRvbmVXYWl0aW5nRm9yQXR0YWNobWVudEluc2VydGlvbik7CiAgICAgb2JzZXJ2ZXIuZXhwZWN0 QXR0YWNobWVudFVwZGF0ZXMoQFsgXSwgQFsgYXR0YWNobWVudC5nZXQoKSBdKTsKIAogICAgIGF1 dG8gZmlyc3RJbWFnZSA9IGFkb3B0TlMoW1tOU0ZpbGVXcmFwcGVyIGFsbG9jXSBpbml0V2l0aFVS TDp0ZXN0SW1hZ2VGaWxlVVJMKCkgb3B0aW9uczowIGVycm9yOm5pbF0pOwo= 367410 2019-04-14 19:00:59 -0700 2019-04-14 21:47:44 -0700 Also reenable the test bug-196905-20190414190058.patch text/plain 4569 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0MjQ5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTY1Y2E2YmQ5NmY2ODUzM2FmYjFjY2Q0NzQxZjExYjVl NDZlNzNjYS4uNDdhYWFkMjBmMTdmNzk5ZWUxZDQ1YTNkMzNmZjVkY2RiZmQzNmUwYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3 IEBACisyMDE5LTA0LTE0ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgor CisgICAgICAgIEFQSSB0ZXN0IFdLQXR0YWNobWVudFRlc3RzLkFkZEF0dGFjaG1lbnRUb0Nvbm5l Y3RlZEltYWdlRWxlbWVudCBpcyBhIGZsYWt5IGZhaWx1cmUgb24gTWFjIFJlbGVhc2UgYnVpbGRz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTY5MDUK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ5ODg2MDk2PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgZmxha3kgdGVzdCBleGVyY2lzZXMgYSBy YWNlIGNvbmRpdGlvbiBiZXR3ZWVuIHdoZW4gYXR0YWNobWVudCBpbnNlcnRpb24gdXBkYXRlcyBh cmUgZGlzcGF0Y2hlZCBmcm9tIHRoZSB3ZWIKKyAgICAgICAgcHJvY2VzcyB0byB0aGUgVUkgcHJv Y2VzcywgYW5kIHdoZW4gc2NyaXB0IGlzIGV4ZWN1dGVkIHZpYSAtW1dLV2ViVmlldyBldmFsdWF0 ZUphdmFTY3JpcHQ6Y29tcGxldGlvbkhhbmRsZXI6XS4KKyAgICAgICAgU2luY2UgYXR0YWNobWVu dCBpbnNlcnRpb24gYW5kIHJlbW92YWwgdXBkYXRlcyBmcm9tIHRoZSB3ZWIgcHJvY2VzcyB0byB0 aGUgVUkgcHJvY2VzcyBhcmUgc2NoZWR1bGVkIG9uIGEgemVyby0KKyAgICAgICAgZGVsYXkgdGlt ZXIsIHdlIGVuZCB1cCB3aXRoIHRoaXMgc2VxdWVuY2Ugb2YgZXZlbnRzIGluIHRoZSBwcm9ibGVt YXRpYyAoZmFpbHVyZSkgY2FzZToKKworICAgICAgICAoYSkgW1VJXSAgICBSdW4gc2NyaXB0ICMx ICh3aGljaCBjYWxscyBgSFRNTEF0dGFjaG1lbnRFbGVtZW50LmdldEF0dGFjaG1lbnRJZGVudGlm aWVyYCkKKyAgICAgICAgICAgIC4uLklQQyBmcm9tIFVJIHRvIHdlYiBwcm9jZXNzLi4uCisgICAg ICAgIChiKSBbV2ViXSAgIEV2YWx1YXRlIHNjcmlwdCAjMSBpbiB0aGUgd2ViIHByb2Nlc3MsIHdo aWNoIHNjaGVkdWxlcyBhdHRhY2htZW50IHVwZGF0ZXMgb24gYSB6ZXJvLWRlbGF5IHRpbWVyCisg ICAgICAgICAgICAuLi5JUEMgZnJvbSB3ZWIgdG8gVUkgcHJvY2Vzcy4uLgorICAgICAgICAoYykg W1VJXSAgICBJbnZva2UgY29tcGxldGlvbiBoYW5kbGVyIGZvciBzY3JpcHQgIzEKKyAgICAgICAg KGQpIFtVSV0gICAgUnVuIHNjcmlwdCAjMiAod2hpY2ggY2FsbHMgYGRvY3VtZW50LnF1ZXJ5U2Vs ZWN0b3IoJ2ltZycpLmF0dGFjaG1lbnRJZGVudGlmaWVyYCkKKyAgICAgICAgICAgIC4uLklQQyBm cm9tIFVJIHRvIHdlYiBwcm9jZXNzLi4uCisgICAgICAgIChlKSBbV2ViXSAgIEV2YWx1YXRlIHNj cmlwdCAjMiBpbiB0aGUgd2ViIHByb2Nlc3MKKyAgICAgICAgKGYpIFtXZWJdICAgWmVyby1kZWxh eSB0aW1lciBmaXJlcyBhbmQgZGlzcGF0Y2hlcyBhdHRhY2htZW50IHVwZGF0ZXMgdG8gdGhlIFVJ IHByb2Nlc3MKKworICAgICAgICAuLi53aGljaCBtZWFucyB0aGF0IHNjcmlwdCAjMiB3aWxsIGNv bXBsZXRlIGJlZm9yZSB0aGUgVUkgcHJvY2VzcyBoYXMgcmVjZWl2ZWQgdGhlIGF0dGFjaG1lbnQg dXBkYXRlcyBzZW50IGluCisgICAgICAgIHN0ZXAgKGYpLiBIb3dldmVyLCBpbiB0aGUgY2FzZSB3 aGVyZSB0aGUgZmxha3kgdGVzdCBzdWNjZWVkcywgdGhlIHplcm8tZGVsYXkgdGltZXIgaW4gKGYp IGZpcmVzICpiZWZvcmUqIHNjcmlwdAorICAgICAgICAjMiBpcyBydW4gaW4gc3RlcCAoZSkuCisK KyAgICAgICAgVGhpcyBwYXRjaCBmaXhlcyB0aGUgZmxha3kgdGVzdCBieSB3YWl0aW5nIHVudGls IGF0dGFjaG1lbnQgaW5zZXJ0aW9uIHVwZGF0ZXMgYXJlIGd1YXJhbnRlZWQgdG8gYmUgcmVjZWl2 ZWQgaW4KKyAgICAgICAgdGhlIFVJIHByb2Nlc3MgYnkgd2FpdGluZyBvbiBhIHNjcmlwdCBtZXNz YWdlIHBvc3RlZCBieSB0aGUgd2ViIHByb2Nlc3MsIGFmdGVyIGF0dGFjaG1lbnQgdXBkYXRlcyBh cmUKKyAgICAgICAgZGlzcGF0Y2hlZC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVzdHMubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJ OjpURVNUKToKKwogMjAxOS0wNC0xNCAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5j b20+CiAKICAgICAgICAgRGlzYWJsZSBGbGFreSBBUEkgVGVzdCBXS0F0dGFjaG1lbnRUZXN0cy5B ZGRBdHRhY2htZW50VG9Db25uZWN0ZWRJbWFnZUVsZW1lbnQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVzdHMubW0gYi9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQXR0YWNobWVudFRlc3RzLm1tCmlu ZGV4IDJiY2EzNjQ4MjZiNTJhOGY1ZWRjODE5M2Y1YjRjMGU2N2Q3MTJhZmQuLjAxYzBjMjU1ZDcw YTczNzE2MDc3MjZiNWI5NjUwYThlOWEwNzFjOGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVzdHMubW0KKysrIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0F0dGFjaG1lbnRUZXN0cy5tbQpAQCAt MTM0NiwxNiArMTM0NiwyNyBAQCBURVNUKFdLQXR0YWNobWVudFRlc3RzLCBDaGFuZ2VGaWxlV3Jh cHBlckZvclBhc3RlZEltYWdlKQogICAgIFt3ZWJWaWV3IHdhaXRGb3JJbWFnZUVsZW1lbnRTaXpl VG9CZWNvbWU6Q0dTaXplTWFrZSgyMTUsIDE3NCldOwogfQogCi1URVNUKFdLQXR0YWNobWVudFRl c3RzLCBESVNBQkxFRF9BZGRBdHRhY2htZW50VG9Db25uZWN0ZWRJbWFnZUVsZW1lbnQpCitURVNU KFdLQXR0YWNobWVudFRlc3RzLCBBZGRBdHRhY2htZW50VG9Db25uZWN0ZWRJbWFnZUVsZW1lbnQp CiB7CiAgICAgYXV0byB3ZWJWaWV3ID0gd2ViVmlld0ZvclRlc3RpbmdBdHRhY2htZW50cygpOwog ICAgIFt3ZWJWaWV3IF9zeW5jaHJvbm91c2x5RXhlY3V0ZUVkaXRDb21tYW5kOkAiSW5zZXJ0SFRN TCIgYXJndW1lbnQ6QCI8aW1nPjwvaW1nPiJdOwogCisgICAgX19ibG9jayBib29sIGRvbmVXYWl0 aW5nRm9yQXR0YWNobWVudEluc2VydGlvbiA9IGZhbHNlOworICAgIFt3ZWJWaWV3IHBlcmZvcm1B ZnRlclJlY2VpdmluZ01lc3NhZ2U6QCJpbnNlcnRlZCIgYWN0aW9uOl57CisgICAgICAgIGRvbmVX YWl0aW5nRm9yQXR0YWNobWVudEluc2VydGlvbiA9IHRydWU7CisgICAgfV07CisKKyAgICBjb25z dCBjaGFyICpzY3JpcHRGb3JFbnN1cmluZ0F0dGFjaG1lbnRJZGVudGlmaWVyID0gXAorICAgICAg ICAiY29uc3QgaWRlbnRpZmllciA9IEhUTUxBdHRhY2htZW50RWxlbWVudC5nZXRBdHRhY2htZW50 SWRlbnRpZmllcihkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCdpbWcnKSk7IgorICAgICAgICAic2V0 VGltZW91dCgoKSA9PiB3ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNz YWdlKCdpbnNlcnRlZCcpLCAwKTsiCisgICAgICAgICJpZGVudGlmaWVyIjsKKwogICAgIE9ic2Vy dmVBdHRhY2htZW50VXBkYXRlc0ZvclNjb3BlIG9ic2VydmVyKHdlYlZpZXcuZ2V0KCkpOwotICAg IE5TU3RyaW5nICphdHRhY2htZW50SWRlbnRpZmllciA9IFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVh dGluZ0phdmFTY3JpcHQ6QCJIVE1MQXR0YWNobWVudEVsZW1lbnQuZ2V0QXR0YWNobWVudElkZW50 aWZpZXIoZG9jdW1lbnQucXVlcnlTZWxlY3RvcignaW1nJykpIl07CisgICAgTlNTdHJpbmcgKmF0 dGFjaG1lbnRJZGVudGlmaWVyID0gW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlw dDpAKHNjcmlwdEZvckVuc3VyaW5nQXR0YWNobWVudElkZW50aWZpZXIpXTsKICAgICBhdXRvIGF0 dGFjaG1lbnQgPSByZXRhaW5QdHIoW3dlYlZpZXcgX2F0dGFjaG1lbnRGb3JJZGVudGlmaWVyOmF0 dGFjaG1lbnRJZGVudGlmaWVyXSk7CiAgICAgRVhQRUNUX1dLX1NUUkVRKGF0dGFjaG1lbnRJZGVu dGlmaWVyLCBbYXR0YWNobWVudCB1bmlxdWVJZGVudGlmaWVyXSk7CiAgICAgRVhQRUNUX1dLX1NU UkVRKGF0dGFjaG1lbnRJZGVudGlmaWVyLCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZh U2NyaXB0OkAiZG9jdW1lbnQucXVlcnlTZWxlY3RvcignaW1nJykuYXR0YWNobWVudElkZW50aWZp ZXIiXSk7CisgICAgVXRpbDo6cnVuKCZkb25lV2FpdGluZ0ZvckF0dGFjaG1lbnRJbnNlcnRpb24p OwogICAgIG9ic2VydmVyLmV4cGVjdEF0dGFjaG1lbnRVcGRhdGVzKEBbIF0sIEBbIGF0dGFjaG1l bnQuZ2V0KCkgXSk7CiAKICAgICBhdXRvIGZpcnN0SW1hZ2UgPSBhZG9wdE5TKFtbTlNGaWxlV3Jh cHBlciBhbGxvY10gaW5pdFdpdGhVUkw6dGVzdEltYWdlRmlsZVVSTCgpIG9wdGlvbnM6MCBlcnJv cjpuaWxdKTsK