176736 2017-09-11 14:22:05 -0700 [iOS WK2] ExternalSourceDataTransferItemGetAsEntry tests produce inconsistent results on test automation bots 2017-09-27 13:01:24 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh aestes commit-queue megan_gardner thorton webkit-bug-importer oldest_to_newest 1347615 0 wenson_hsieh 2017-09-11 14:22:05 -0700 These tests are failing on the bots, since the order in which files are read and appear is different from the order observed locally on my machine. Instead, these tests should be tweaked so they don't spit out FileSystemEntry output in arbitrary order. 1347622 1 320479 wenson_hsieh 2017-09-11 14:27:41 -0700 Created attachment 320479 Patch 1347644 2 320479 megan_gardner 2017-09-11 15:01:43 -0700 Comment on attachment 320479 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=320479&action=review Good fix, just make sure that what you're testing against is also guaranteed to be in alphabetical order. then r=me. Not sure if you need a WK2 review as well. > Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm:966 > ]; I don't see that this list is sorted again in code. Can you either do that and/or make a comment that these are expected to be in alphabetical order? 1347649 3 320479 wenson_hsieh 2017-09-11 15:06:57 -0700 Comment on attachment 320479 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=320479&action=review >> Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm:966 >> ]; > > I don't see that this list is sorted again in code. Can you either do that and/or make a comment that these are expected to be in alphabetical order? I don't think sorting this test expectation is really needed, since it's hard-coded anyways to be in alphabetical order...I'll add a comment to make this more apparent, though. 1347691 4 320493 wenson_hsieh 2017-09-11 15:52:06 -0700 Created attachment 320493 Patch for landing 1347724 5 320493 commit-queue 2017-09-11 16:34:07 -0700 Comment on attachment 320493 Patch for landing Clearing flags on attachment: 320493 Committed r221893: <http://trac.webkit.org/changeset/221893> 1353770 6 webkit-bug-importer 2017-09-27 13:01:24 -0700 <rdar://problem/34694490> 320479 2017-09-11 14:27:41 -0700 2017-09-11 15:47:12 -0700 Patch bug-176736-20170911142740.patch text/plain 4979 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxODcwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzVhZmE5ZTY5OTUzZTI1ZGY5YzgxZGZmM2FhODE4NzU4 ODVhOWQyMi4uZTY5ODBlMWJjNmQzZjZiNjNhOWIyZTE3ZDUwMzVmMjAzZGUzNmFiYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIw IEBACiAyMDE3LTA5LTExICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgog CisgICAgICAgIFtpT1MgV0syXSBFeHRlcm5hbFNvdXJjZURhdGFUcmFuc2Zlckl0ZW1HZXRBc0Vu dHJ5IHRlc3RzIHByb2R1Y2UgaW5jb25zaXN0ZW50IHJlc3VsdHMgb24gdGVzdCBhdXRvbWF0aW9u IGJvdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 NjczNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo ZSB0ZXN0IG91dHB1dCBkdW1wZWQgd2hlbiBkcm9wcGluZyBhIGZpbGUgaW4gRGF0YVRyYW5zZmVy SXRlbS1nZXRBc0VudHJ5Lmh0bWwgc2hvdWxkIGFkaGVyZSB0byBzb21lIGRldGVybWluaXN0aWMg b3JkZXIuCisgICAgICAgIEN1cnJlbnRseSwgdGhpcyBpcyBub3QgZW5mb3JjZWQsIHNvIG9uIHNv bWUgc3lzdGVtcywgdGhlc2UgdGVzdHMgZmFpbCBkdWUgdG8gZXhwZWN0ZWQgdGVzdCBvdXRwdXQg YmVpbmcgb3V0IG9mIG9yZGVyLiBUbworICAgICAgICBmaXggdGhpcywgc2ltcGx5IGhhdmUgdGhl IHRlc3QgaGFybmVzcyBhbHBoYWJldGljYWxseSBzb3J0IHRoZSBvdXRwdXQgYmVmb3JlIHdyaXRp bmcgdG8gdGhlIHRleHRhcmVhLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9EYXRhVHJhbnNmZXJJdGVtLWdldEFzRW50cnkuaHRtbDoKKyAgICAgICAgKiBUZXN0 V2ViS2l0QVBJL1Rlc3RzL2lvcy9EYXRhSW50ZXJhY3Rpb25UZXN0cy5tbToKKyAgICAgICAgKFRl c3RXZWJLaXRBUEk6OlRFU1QpOgorCisyMDE3LTA5LTExICBXZW5zb24gSHNpZWggIDx3ZW5zb25f aHNpZWhAYXBwbGUuY29tPgorCiAgICAgICAgIFtpT1MgRG5EXSBFbGVtZW50cyBpbiB0aGUgRE9N IHdpdGggdGhlIGBkcmFnZ2FibGVgIGF0dHJpYnV0ZSBzaG91bGQgYmUgZHJhZ2dhYmxlCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzY2NjQKICAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzMyNTk2MTU2PgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9EYXRhVHJhbnNmZXJJdGVtLWdldEFzRW50cnkuaHRtbCBi L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRGF0YVRyYW5zZmVySXRlbS1n ZXRBc0VudHJ5Lmh0bWwKaW5kZXggYWM5MGMxNWQxODhmMzg5Y2I4MmJmM2E4NzMzMmEyYmM0YTg1 MTczNy4uMmIxMTYzZGUwNGU2ZmYyNjBmMjdkOTFkYzJhY2E2OGNkMDc5MTcxMyAxMDA2NDQKLS0t IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9EYXRhVHJhbnNmZXJJdGVt LWdldEFzRW50cnkuaHRtbAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL0RhdGFUcmFuc2Zlckl0ZW0tZ2V0QXNFbnRyeS5odG1sCkBAIC02OSwxNiArNjksMTYgQEAg aHRtbCwgYm9keSB7CiAKICAgICBhc3luYyBmdW5jdGlvbiByZXByZXNlbnRhdGlvbkZvckZpbGVT eXN0ZW1FbnRyeShlbnRyeSkKICAgICB7Ci0gICAgICAgIGxldCByZXByZXNlbnRhdGlvbiA9ICIi OworICAgICAgICBsZXQgbGluZXMgPSBbXTsKICAgICAgICAgaWYgKGVudHJ5LmlzRGlyZWN0b3J5 KSB7Ci0gICAgICAgICAgICByZXByZXNlbnRhdGlvbiArPSBgRElSOiAke2VudHJ5LmZ1bGxQYXRo fVxuYDsKKyAgICAgICAgICAgIGxpbmVzLnB1c2goYERJUjogJHtlbnRyeS5mdWxsUGF0aH1gKTsK ICAgICAgICAgICAgIGZvciAobGV0IGNoaWxkIG9mIGF3YWl0IGdldENoaWxkRW50cmllcyhlbnRy eSkpCi0gICAgICAgICAgICAgICAgcmVwcmVzZW50YXRpb24gKz0gYXdhaXQgcmVwcmVzZW50YXRp b25Gb3JGaWxlU3lzdGVtRW50cnkoY2hpbGQpOworICAgICAgICAgICAgICAgIGxpbmVzID0gbGlu ZXMuY29uY2F0KGF3YWl0IHJlcHJlc2VudGF0aW9uRm9yRmlsZVN5c3RlbUVudHJ5KGNoaWxkKSk7 CiAgICAgICAgIH0gZWxzZSBpZiAoZW50cnkuaXNGaWxlKSB7CiAgICAgICAgICAgICBsZXQgZmls ZSA9IGF3YWl0IGZpbGVGcm9tRmlsZVN5c3RlbUZpbGVFbnRyeShlbnRyeSk7Ci0gICAgICAgICAg ICByZXByZXNlbnRhdGlvbiArPSBgRklMRTogJHtlbnRyeS5mdWxsUGF0aH0gKCcke2ZpbGUudHlw ZX0nLCAke2ZpbGUuc2l6ZX0gYnl0ZXMpXG5gOworICAgICAgICAgICAgbGluZXMucHVzaChgRklM RTogJHtlbnRyeS5mdWxsUGF0aH0gKCcke2ZpbGUudHlwZX0nLCAke2ZpbGUuc2l6ZX0gYnl0ZXMp YCk7CiAgICAgICAgIH0KLSAgICAgICAgcmV0dXJuIHJlcHJlc2VudGF0aW9uOworICAgICAgICBy ZXR1cm4gbGluZXM7CiAgICAgfQogCiAgICAgYXN5bmMgZnVuY3Rpb24gbG9nSXRlbUFuZEZpbGVF bnRyeUluZm9ybWF0aW9uKGl0ZW1zKQpAQCAtODksNyArODksNyBAQCBodG1sLCBib2R5IHsKICAg ICAgICAgICAgIG91dHB1dC52YWx1ZSArPSBgRm91bmQgZGF0YSB0cmFuc2ZlciBpdGVtIChraW5k OiAnJHtpdGVtLmtpbmR9JywgdHlwZTogJyR7aXRlbS50eXBlfScpXG5gOwogICAgICAgICAgICAg bGV0IGVudHJ5ID0gaXRlbS53ZWJraXRHZXRBc0VudHJ5KCk7CiAgICAgICAgICAgICBpZiAoZW50 cnkpCi0gICAgICAgICAgICAgICAgb3V0cHV0LnZhbHVlICs9IGF3YWl0IHJlcHJlc2VudGF0aW9u Rm9yRmlsZVN5c3RlbUVudHJ5KGVudHJ5KTsKKyAgICAgICAgICAgICAgICBvdXRwdXQudmFsdWUg Kz0gKGF3YWl0IHJlcHJlc2VudGF0aW9uRm9yRmlsZVN5c3RlbUVudHJ5KGVudHJ5KSkuc29ydCgp LmpvaW4oIlxuIik7CiAgICAgICAgIH0KICAgICB9CiA8L3NjcmlwdD4KZGlmZiAtLWdpdCBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL0RhdGFJbnRlcmFjdGlvblRlc3RzLm1tIGIvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvRGF0YUludGVyYWN0aW9uVGVzdHMubW0KaW5kZXgg NjM0MTI2Yzg4MjA0ZjgyZDdkNTU0Mjc0NDY0ZDM3OWIwYTNjYmNkNC4uYTllMThiYzg5MDBjN2Ix ZmNjN2QxMDM2YzRlZTEzYTg3MDM0YWE0MCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9pb3MvRGF0YUludGVyYWN0aW9uVGVzdHMubW0KKysrIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9pb3MvRGF0YUludGVyYWN0aW9uVGVzdHMubW0KQEAgLTk1NywxMyArOTU3LDEy IEBAIFRFU1QoRGF0YUludGVyYWN0aW9uVGVzdHMsIEV4dGVybmFsU291cmNlRGF0YVRyYW5zZmVy SXRlbUdldEZvbGRlckFzRW50cnkpCiAgICAgICAgIEAiRm91bmQgZGF0YSB0cmFuc2ZlciBpdGVt IChraW5kOiAnc3RyaW5nJywgdHlwZTogJ3RleHQvcGxhaW4nKSIsCiAgICAgICAgIEAiRm91bmQg ZGF0YSB0cmFuc2ZlciBpdGVtIChraW5kOiAnZmlsZScsIHR5cGU6ICcnKSIsCiAgICAgICAgIEAi RElSOiAvc29tZWRpcmVjdG9yeSIsCi0gICAgICAgIEAiRklMRTogL3NvbWVkaXJlY3RvcnkvaWNv bi5wbmcgKCdpbWFnZS9wbmcnLCA0MjEzMCBieXRlcykiLAogICAgICAgICBAIkRJUjogL3NvbWVk aXJlY3Rvcnkvc3ViZGlyZWN0b3J5MSIsCi0gICAgICAgIEAiRklMRTogL3NvbWVkaXJlY3Rvcnkv c3ViZGlyZWN0b3J5MS90ZXh0LWZpbGUtMS50eHQgKCd0ZXh0L3BsYWluJywgNDMgYnl0ZXMpIiwK LSAgICAgICAgQCJGSUxFOiAvc29tZWRpcmVjdG9yeS9hcmNoaXZlLnppcCAoJ2FwcGxpY2F0aW9u L3ppcCcsIDk4OCBieXRlcykiLAogICAgICAgICBAIkRJUjogL3NvbWVkaXJlY3Rvcnkvc3ViZGly ZWN0b3J5MiIsCi0gICAgICAgIEAiRklMRTogL3NvbWVkaXJlY3Rvcnkvc3ViZGlyZWN0b3J5Mi90 ZXh0LWZpbGUtMi50eHQgKCd0ZXh0L3BsYWluJywgNDQgYnl0ZXMpIiwKLSAgICAgICAgQCIiCisg ICAgICAgIEAiRklMRTogL3NvbWVkaXJlY3RvcnkvYXJjaGl2ZS56aXAgKCdhcHBsaWNhdGlvbi96 aXAnLCA5ODggYnl0ZXMpIiwKKyAgICAgICAgQCJGSUxFOiAvc29tZWRpcmVjdG9yeS9pY29uLnBu ZyAoJ2ltYWdlL3BuZycsIDQyMTMwIGJ5dGVzKSIsCisgICAgICAgIEAiRklMRTogL3NvbWVkaXJl Y3Rvcnkvc3ViZGlyZWN0b3J5MS90ZXh0LWZpbGUtMS50eHQgKCd0ZXh0L3BsYWluJywgNDMgYnl0 ZXMpIiwKKyAgICAgICAgQCJGSUxFOiAvc29tZWRpcmVjdG9yeS9zdWJkaXJlY3RvcnkyL3RleHQt ZmlsZS0yLnR4dCAoJ3RleHQvcGxhaW4nLCA0NCBieXRlcykiCiAgICAgXTsKIAogICAgIGF1dG8g d2ViVmlldyA9IHNldFVwVGVzdFdlYlZpZXdGb3JEYXRhVHJhbnNmZXJJdGVtcygpOwpAQCAtOTk0 LDggKzk5Myw3IEBAIFRFU1QoRGF0YUludGVyYWN0aW9uVGVzdHMsIEV4dGVybmFsU291cmNlRGF0 YVRyYW5zZmVySXRlbUdldFBsYWluVGV4dEZpbGVBc0VudHJ5CiAgICAgTlNBcnJheTxOU1N0cmlu ZyAqPiAqZXhwZWN0ZWRPdXRwdXQgPSBAWwogICAgICAgICBAIkZvdW5kIGRhdGEgdHJhbnNmZXIg aXRlbSAoa2luZDogJ3N0cmluZycsIHR5cGU6ICd0ZXh0L3BsYWluJykiLAogICAgICAgICBAIkZv dW5kIGRhdGEgdHJhbnNmZXIgaXRlbSAoa2luZDogJ2ZpbGUnLCB0eXBlOiAndGV4dC9wbGFpbicp IiwKLSAgICAgICAgQCJGSUxFOiAvZm9vLnR4dCAoJ3RleHQvcGxhaW4nLCAyOCBieXRlcykiLAot ICAgICAgICBAIiIKKyAgICAgICAgQCJGSUxFOiAvZm9vLnR4dCAoJ3RleHQvcGxhaW4nLCAyOCBi eXRlcykiCiAgICAgXTsKIAogICAgIGF1dG8gd2ViVmlldyA9IHNldFVwVGVzdFdlYlZpZXdGb3JE YXRhVHJhbnNmZXJJdGVtcygpOwo= 320493 2017-09-11 15:52:06 -0700 2017-09-11 16:34:07 -0700 Patch for landing bug-176736-20170911155205.patch text/plain 5304 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxODcwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzVhZmE5ZTY5OTUzZTI1ZGY5YzgxZGZmM2FhODE4NzU4 ODVhOWQyMi4uOWE5ZDRhNmY1NDJkODA1ZDUxYTEwMGI2NWJhODhiMjdkYmU4YzYzMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIw IEBACiAyMDE3LTA5LTExICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgog CisgICAgICAgIFtpT1MgV0syXSBFeHRlcm5hbFNvdXJjZURhdGFUcmFuc2Zlckl0ZW1HZXRBc0Vu dHJ5IHRlc3RzIHByb2R1Y2UgaW5jb25zaXN0ZW50IHJlc3VsdHMgb24gdGVzdCBhdXRvbWF0aW9u IGJvdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 NjczNgorCisgICAgICAgIFJldmlld2VkIGJ5IEFuZHkgRXN0ZXMgYW5kIE1lZ2FuIEdhcmRuZXIu CisKKyAgICAgICAgVGhlIHRlc3Qgb3V0cHV0IGR1bXBlZCB3aGVuIGRyb3BwaW5nIGEgZmlsZSBp biBEYXRhVHJhbnNmZXJJdGVtLWdldEFzRW50cnkuaHRtbCBzaG91bGQgYWRoZXJlIHRvIHNvbWUg ZGV0ZXJtaW5pc3RpYyBvcmRlci4KKyAgICAgICAgQ3VycmVudGx5LCB0aGlzIGlzIG5vdCBlbmZv cmNlZCwgc28gb24gc29tZSBzeXN0ZW1zLCB0aGVzZSB0ZXN0cyBmYWlsIGR1ZSB0byBleHBlY3Rl ZCB0ZXN0IG91dHB1dCBiZWluZyBvdXQgb2Ygb3JkZXIuIFRvCisgICAgICAgIGZpeCB0aGlzLCBz aW1wbHkgaGF2ZSB0aGUgdGVzdCBoYXJuZXNzIGFscGhhYmV0aWNhbGx5IHNvcnQgdGhlIG91dHB1 dCBiZWZvcmUgd3JpdGluZyB0byB0aGUgdGV4dGFyZWEuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL0RhdGFUcmFuc2Zlckl0ZW0tZ2V0QXNFbnRyeS5odG1sOgor ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL0RhdGFJbnRlcmFjdGlvblRlc3RzLm1t OgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisKKzIwMTctMDktMTEgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKICAgICAgICAgW2lPUyBEbkRdIEVsZW1l bnRzIGluIHRoZSBET00gd2l0aCB0aGUgYGRyYWdnYWJsZWAgYXR0cmlidXRlIHNob3VsZCBiZSBk cmFnZ2FibGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE3NjY2NAogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzI1OTYxNTY+CmRpZmYgLS1naXQgYS9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0RhdGFUcmFuc2Zlckl0ZW0tZ2V0 QXNFbnRyeS5odG1sIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9EYXRh VHJhbnNmZXJJdGVtLWdldEFzRW50cnkuaHRtbAppbmRleCBhYzkwYzE1ZDE4OGYzODljYjgyYmYz YTg3MzMyYTJiYzRhODUxNzM3Li4yYjExNjNkZTA0ZTZmZjI2MGYyN2Q5MWRjMmFjYTY4Y2QwNzkx NzEzIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0Rh dGFUcmFuc2Zlckl0ZW0tZ2V0QXNFbnRyeS5odG1sCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvRGF0YVRyYW5zZmVySXRlbS1nZXRBc0VudHJ5Lmh0bWwKQEAgLTY5 LDE2ICs2OSwxNiBAQCBodG1sLCBib2R5IHsKIAogICAgIGFzeW5jIGZ1bmN0aW9uIHJlcHJlc2Vu dGF0aW9uRm9yRmlsZVN5c3RlbUVudHJ5KGVudHJ5KQogICAgIHsKLSAgICAgICAgbGV0IHJlcHJl c2VudGF0aW9uID0gIiI7CisgICAgICAgIGxldCBsaW5lcyA9IFtdOwogICAgICAgICBpZiAoZW50 cnkuaXNEaXJlY3RvcnkpIHsKLSAgICAgICAgICAgIHJlcHJlc2VudGF0aW9uICs9IGBESVI6ICR7 ZW50cnkuZnVsbFBhdGh9XG5gOworICAgICAgICAgICAgbGluZXMucHVzaChgRElSOiAke2VudHJ5 LmZ1bGxQYXRofWApOwogICAgICAgICAgICAgZm9yIChsZXQgY2hpbGQgb2YgYXdhaXQgZ2V0Q2hp bGRFbnRyaWVzKGVudHJ5KSkKLSAgICAgICAgICAgICAgICByZXByZXNlbnRhdGlvbiArPSBhd2Fp dCByZXByZXNlbnRhdGlvbkZvckZpbGVTeXN0ZW1FbnRyeShjaGlsZCk7CisgICAgICAgICAgICAg ICAgbGluZXMgPSBsaW5lcy5jb25jYXQoYXdhaXQgcmVwcmVzZW50YXRpb25Gb3JGaWxlU3lzdGVt RW50cnkoY2hpbGQpKTsKICAgICAgICAgfSBlbHNlIGlmIChlbnRyeS5pc0ZpbGUpIHsKICAgICAg ICAgICAgIGxldCBmaWxlID0gYXdhaXQgZmlsZUZyb21GaWxlU3lzdGVtRmlsZUVudHJ5KGVudHJ5 KTsKLSAgICAgICAgICAgIHJlcHJlc2VudGF0aW9uICs9IGBGSUxFOiAke2VudHJ5LmZ1bGxQYXRo fSAoJyR7ZmlsZS50eXBlfScsICR7ZmlsZS5zaXplfSBieXRlcylcbmA7CisgICAgICAgICAgICBs aW5lcy5wdXNoKGBGSUxFOiAke2VudHJ5LmZ1bGxQYXRofSAoJyR7ZmlsZS50eXBlfScsICR7Zmls ZS5zaXplfSBieXRlcylgKTsKICAgICAgICAgfQotICAgICAgICByZXR1cm4gcmVwcmVzZW50YXRp b247CisgICAgICAgIHJldHVybiBsaW5lczsKICAgICB9CiAKICAgICBhc3luYyBmdW5jdGlvbiBs b2dJdGVtQW5kRmlsZUVudHJ5SW5mb3JtYXRpb24oaXRlbXMpCkBAIC04OSw3ICs4OSw3IEBAIGh0 bWwsIGJvZHkgewogICAgICAgICAgICAgb3V0cHV0LnZhbHVlICs9IGBGb3VuZCBkYXRhIHRyYW5z ZmVyIGl0ZW0gKGtpbmQ6ICcke2l0ZW0ua2luZH0nLCB0eXBlOiAnJHtpdGVtLnR5cGV9JylcbmA7 CiAgICAgICAgICAgICBsZXQgZW50cnkgPSBpdGVtLndlYmtpdEdldEFzRW50cnkoKTsKICAgICAg ICAgICAgIGlmIChlbnRyeSkKLSAgICAgICAgICAgICAgICBvdXRwdXQudmFsdWUgKz0gYXdhaXQg cmVwcmVzZW50YXRpb25Gb3JGaWxlU3lzdGVtRW50cnkoZW50cnkpOworICAgICAgICAgICAgICAg IG91dHB1dC52YWx1ZSArPSAoYXdhaXQgcmVwcmVzZW50YXRpb25Gb3JGaWxlU3lzdGVtRW50cnko ZW50cnkpKS5zb3J0KCkuam9pbigiXG4iKTsKICAgICAgICAgfQogICAgIH0KIDwvc2NyaXB0Pgpk aWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvRGF0YUludGVyYWN0aW9u VGVzdHMubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9EYXRhSW50ZXJhY3Rpb25U ZXN0cy5tbQppbmRleCA2MzQxMjZjODgyMDRmODJkN2Q1NTQyNzQ0NjRkMzc5YjBhM2NiY2Q0Li4z ODM4NGUwOWQ4YWUwNWM3YmI1OGIyYzczOGIxZWI5YjE4YzU1YzE2IDEwMDY0NAotLS0gYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9EYXRhSW50ZXJhY3Rpb25UZXN0cy5tbQorKysgYi9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9EYXRhSW50ZXJhY3Rpb25UZXN0cy5tbQpAQCAt OTUzLDE3ICs5NTMsMTggQEAgc3RhdGljIFJldGFpblB0cjxUZXN0V0tXZWJWaWV3PiBzZXRVcFRl c3RXZWJWaWV3Rm9yRGF0YVRyYW5zZmVySXRlbXMoKQogCiBURVNUKERhdGFJbnRlcmFjdGlvblRl c3RzLCBFeHRlcm5hbFNvdXJjZURhdGFUcmFuc2Zlckl0ZW1HZXRGb2xkZXJBc0VudHJ5KQogewor ICAgIC8vIFRoZSBleHBlY3RlZCBvdXRwdXQgaXMgc29ydGVkIGJ5IGFscGhhYmV0aWNhbCBvcmRl ciBoZXJlIGZvciBjb25zaXN0ZW50IGJlaGF2aW9yIGFjcm9zcyBkaWZmZXJlbnQgdGVzdCBlbnZp cm9ubWVudHMuCisgICAgLy8gU2VlIERhdGFUcmFuc2Zlckl0ZW0tZ2V0QXNFbnRyeS5odG1sIGZv ciBtb3JlIGRldGFpbHMuCiAgICAgTlNBcnJheTxOU1N0cmluZyAqPiAqZXhwZWN0ZWRPdXRwdXQg PSBAWwogICAgICAgICBAIkZvdW5kIGRhdGEgdHJhbnNmZXIgaXRlbSAoa2luZDogJ3N0cmluZycs IHR5cGU6ICd0ZXh0L3BsYWluJykiLAogICAgICAgICBAIkZvdW5kIGRhdGEgdHJhbnNmZXIgaXRl bSAoa2luZDogJ2ZpbGUnLCB0eXBlOiAnJykiLAogICAgICAgICBAIkRJUjogL3NvbWVkaXJlY3Rv cnkiLAotICAgICAgICBAIkZJTEU6IC9zb21lZGlyZWN0b3J5L2ljb24ucG5nICgnaW1hZ2UvcG5n JywgNDIxMzAgYnl0ZXMpIiwKICAgICAgICAgQCJESVI6IC9zb21lZGlyZWN0b3J5L3N1YmRpcmVj dG9yeTEiLAotICAgICAgICBAIkZJTEU6IC9zb21lZGlyZWN0b3J5L3N1YmRpcmVjdG9yeTEvdGV4 dC1maWxlLTEudHh0ICgndGV4dC9wbGFpbicsIDQzIGJ5dGVzKSIsCi0gICAgICAgIEAiRklMRTog L3NvbWVkaXJlY3RvcnkvYXJjaGl2ZS56aXAgKCdhcHBsaWNhdGlvbi96aXAnLCA5ODggYnl0ZXMp IiwKICAgICAgICAgQCJESVI6IC9zb21lZGlyZWN0b3J5L3N1YmRpcmVjdG9yeTIiLAotICAgICAg ICBAIkZJTEU6IC9zb21lZGlyZWN0b3J5L3N1YmRpcmVjdG9yeTIvdGV4dC1maWxlLTIudHh0ICgn dGV4dC9wbGFpbicsIDQ0IGJ5dGVzKSIsCi0gICAgICAgIEAiIgorICAgICAgICBAIkZJTEU6IC9z b21lZGlyZWN0b3J5L2FyY2hpdmUuemlwICgnYXBwbGljYXRpb24vemlwJywgOTg4IGJ5dGVzKSIs CisgICAgICAgIEAiRklMRTogL3NvbWVkaXJlY3RvcnkvaWNvbi5wbmcgKCdpbWFnZS9wbmcnLCA0 MjEzMCBieXRlcykiLAorICAgICAgICBAIkZJTEU6IC9zb21lZGlyZWN0b3J5L3N1YmRpcmVjdG9y eTEvdGV4dC1maWxlLTEudHh0ICgndGV4dC9wbGFpbicsIDQzIGJ5dGVzKSIsCisgICAgICAgIEAi RklMRTogL3NvbWVkaXJlY3Rvcnkvc3ViZGlyZWN0b3J5Mi90ZXh0LWZpbGUtMi50eHQgKCd0ZXh0 L3BsYWluJywgNDQgYnl0ZXMpIgogICAgIF07CiAKICAgICBhdXRvIHdlYlZpZXcgPSBzZXRVcFRl c3RXZWJWaWV3Rm9yRGF0YVRyYW5zZmVySXRlbXMoKTsKQEAgLTk5NCw4ICs5OTUsNyBAQCBURVNU KERhdGFJbnRlcmFjdGlvblRlc3RzLCBFeHRlcm5hbFNvdXJjZURhdGFUcmFuc2Zlckl0ZW1HZXRQ bGFpblRleHRGaWxlQXNFbnRyeQogICAgIE5TQXJyYXk8TlNTdHJpbmcgKj4gKmV4cGVjdGVkT3V0 cHV0ID0gQFsKICAgICAgICAgQCJGb3VuZCBkYXRhIHRyYW5zZmVyIGl0ZW0gKGtpbmQ6ICdzdHJp bmcnLCB0eXBlOiAndGV4dC9wbGFpbicpIiwKICAgICAgICAgQCJGb3VuZCBkYXRhIHRyYW5zZmVy IGl0ZW0gKGtpbmQ6ICdmaWxlJywgdHlwZTogJ3RleHQvcGxhaW4nKSIsCi0gICAgICAgIEAiRklM RTogL2Zvby50eHQgKCd0ZXh0L3BsYWluJywgMjggYnl0ZXMpIiwKLSAgICAgICAgQCIiCisgICAg ICAgIEAiRklMRTogL2Zvby50eHQgKCd0ZXh0L3BsYWluJywgMjggYnl0ZXMpIgogICAgIF07CiAK ICAgICBhdXRvIHdlYlZpZXcgPSBzZXRVcFRlc3RXZWJWaWV3Rm9yRGF0YVRyYW5zZmVySXRlbXMo KTsK