169701 2017-03-15 15:27:06 -0700 Fix unit test and bug fix for 'pull-os-versions.js' script. 2017-03-15 23:29:11 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dewei_zhu webkit-unassigned commit-queue dewei_zhu rniwa oldest_to_newest 1288277 0 dewei_zhu 2017-03-15 15:27:06 -0700 Fix unit test and bug fix for 'pull-os-versions.js' script. 1288283 1 304561 dewei_zhu 2017-03-15 15:33:34 -0700 Created attachment 304561 Patch 1288444 2 304561 rniwa 2017-03-15 21:24:14 -0700 Comment on attachment 304561 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=304561&action=review > Websites/perf.webkit.org/ChangeLog:9 > + Fix 'pull-os-versions.js' does not fetch new builds and report. This sentence has two verbs. Fix the bug that 'pull-os-versions.js' does not fetch new builds and report? > Websites/perf.webkit.org/tools/pull-os-versions.js:34 > + return fetchers.reduce((promise, fetcher) => { > + return promise.then(fetcher.fetchAndReportNewBuilds()); > + }, Promise.resolve()); Are you sure you really meant to call chain the promise returned by fetcher.fetchAndReportNewBuilds()? If you want to call each promise in sentience, you need to do: (promise, fetcher) => { return promise.then(() => fetcher.fetchAndReportNewBuilds()); } Perhaps you want to create a new helper function that sequentialize promises? 1288461 3 304609 dewei_zhu 2017-03-15 22:06:46 -0700 Created attachment 304609 Patch 1288468 4 304609 rniwa 2017-03-15 22:21:06 -0700 Comment on attachment 304609 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=304609&action=review > Websites/perf.webkit.org/tools/pull-os-versions.js:33 > + return promise.then(() => {return fetcher.fetchAndReportNewBuilds();}); I think you can just do () => fetcher.fetchAndReportNewBuilds(). 1288472 5 304613 dewei_zhu 2017-03-15 22:48:58 -0700 Created attachment 304613 Patch for landing 1288475 6 304613 commit-queue 2017-03-15 23:29:06 -0700 Comment on attachment 304613 Patch for landing Clearing flags on attachment: 304613 Committed r214031: <http://trac.webkit.org/changeset/214031> 1288476 7 commit-queue 2017-03-15 23:29:11 -0700 All reviewed patches have been landed. Closing bug. 304561 2017-03-15 15:33:34 -0700 2017-03-15 22:06:39 -0700 Patch bug-169701-20170315153333.patch text/plain 4726 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0MDEwCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBhMTJjYmJlMzFlZTk4MWZhNzliZjQ1MDY3ZGI4ZTM1MjBkNTUwMTNiLi45NjY3YzhlNDhh YTE2MzE0NDdkOWY1M2RkYjIyNjFiODliYWEzZTY5IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxNy0wMy0xNSAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBGaXggdW5pdCB0ZXN0IGFuZCBidWcgZml4IGZvciAncHVs bC1vcy12ZXJzaW9ucy5qcycgc2NyaXB0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTY5NzAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRml4IHVuaXQgdGVzdHMgd2FybmluZ3Mgb24gbm9kZS02LjEwLjAu CisgICAgICAgIEZpeCAncHVsbC1vcy12ZXJzaW9ucy5qcycgZG9lcyBub3QgZmV0Y2ggbmV3IGJ1 aWxkcyBhbmQgcmVwb3J0LgorCisgICAgICAgICogc2VydmVyLXRlc3RzL3Rvb2xzLW9zLWJ1aWxk LWZldGNoZXItdGVzdHMuanM6CisgICAgICAgICh0aGVuKToKKyAgICAgICAgKGJlZm9yZUVhY2gp OgorICAgICAgICAoYWZ0ZXJFYWNoKToKKyAgICAgICAgKiB0b29scy9wdWxsLW9zLXZlcnNpb25z LmpzOgorICAgICAgICAoc3luY0xvb3ApOgorCiAyMDE3LTAzLTE1ICBSeW9zdWtlIE5pd2EgIDxy bml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIEluLWJyb3dzZXIgYW5kIG5vZGUuanMgaW1wbGVt ZW50YXRpb25zIG9mIFJlbW90ZUFQSSBzaG91bGQgc2hhcmUgc29tZSBjb2RlCmRpZmYgLS1naXQg YS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRlc3RzL3Rvb2xzLW9zLWJ1aWxkLWZl dGNoZXItdGVzdHMuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRlc3RzL3Rv b2xzLW9zLWJ1aWxkLWZldGNoZXItdGVzdHMuanMKaW5kZXggNTZiY2Q1OTk3MzVjN2I4MjAxMmVl ZjAyNDdiNmE2ZmI2MGJhNDQxNC4uZGVmYTA2MDNhYjE0MjMzOTI0ZDUzMmY2MzU5NDc0M2I2ZmUw OWM0YSAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy90 b29scy1vcy1idWlsZC1mZXRjaGVyLXRlc3RzLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9zZXJ2ZXItdGVzdHMvdG9vbHMtb3MtYnVpbGQtZmV0Y2hlci10ZXN0cy5qcwpAQCAtMTIs NyArMTIsOCBAQCBjb25zdCBNb2NrTG9nZ2VyID0gcmVxdWlyZSgnLi9yZXNvdXJjZXMvbW9jay1s b2dnZXIuanMnKS5Nb2NrTG9nZ2VyOwogCiAKIGRlc2NyaWJlKCdPU0J1aWxkRmV0Y2hlcicsIGZ1 bmN0aW9uKCkgewotICAgIHByZXBhcmVTZXJ2ZXJUZXN0KHRoaXMpOworICAgIHRoaXMudGltZW91 dCg1MDAwKTsKKyAgICBUZXN0U2VydmVyLmluamVjdCgpOwogCiAgICAgYmVmb3JlRWFjaChmdW5j dGlvbiAoKSB7CiAgICAgICAgIE1vY2tSZW1vdGVBUEkucmVzZXQoJ2h0dHA6Ly9idWlsZC53ZWJr aXQub3JnJyk7CkBAIC0zNCw3ICszNSw3IEBAIGRlc2NyaWJlKCdPU0J1aWxkRmV0Y2hlcicsIGZ1 bmN0aW9uKCkgewogICAgIH07CiAKICAgICBjb25zdCBhbm90aGVyU3ViQ29tbWl0V2l0aFdlYktp dCA9IHsKLSAgICAgICAgJ1dlYktpdCc6IHsncmV2aXNpb24nOiAnMTQxOTk5Jyx9CisgICAgICAg ICdXZWJLaXQnOiB7J3JldmlzaW9uJzogJzE0MTk5OSd9CiAgICAgfTsKIAogICAgIGNvbnN0IGFu b3RoZXJTdWJDb21taXRXaXRoV2ViS2l0QW5kSmF2YVNjcmlwdENvcmUgPSB7CkBAIC0xMzIsMTIg KzEzMyw4IEBAIGRlc2NyaWJlKCdPU0J1aWxkRmV0Y2hlcicsIGZ1bmN0aW9uKCkgewogICAgICAg ICAgICAgICAgIHJldHVybiBmZXRjaENvbW1pdHNQcm9taXNlOwogICAgICAgICAgICAgfSkudGhl bigocmVzdWx0cykgPT4gewogICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZXN1bHRzLmxl bmd0aCwgMik7Ci0gICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHJlc3VsdHNbMF1bJ3JlcG9z aXRvcnknXSwgJ09TWCcpOwotICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZXN1bHRzWzBd WydyZXZpc2lvbiddLCAnMTZFMzIxeicpOwotICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChy ZXN1bHRzWzBdWydvcmRlciddLCAxNjA0MDMyMTI2KTsKLSAgICAgICAgICAgICAgICBhc3NlcnQu ZXF1YWwocmVzdWx0c1sxXVsncmVwb3NpdG9yeSddLCAnT1NYJyk7Ci0gICAgICAgICAgICAgICAg YXNzZXJ0LmVxdWFsKHJlc3VsdHNbMV1bJ3JldmlzaW9uJ10sICcxNkYzMjEnKTsKLSAgICAgICAg ICAgICAgICBhc3NlcnQuZXF1YWwocmVzdWx0c1sxXVsnb3JkZXInXSwgMTYwNTAzMjEwMCk7Cisg ICAgICAgICAgICAgICAgYXNzZXJ0LmRlZXBFcXVhbChyZXN1bHRzWzBdLCB7cmVwb3NpdG9yeTog J09TWCcsIG9yZGVyOiAxNjA0MDMyMTI2LCByZXZpc2lvbjogJzE2RTMyMXonfSk7CisgICAgICAg ICAgICAgICAgYXNzZXJ0LmRlZXBFcXVhbChyZXN1bHRzWzFdLCB7cmVwb3NpdG9yeTogJ09TWCcs IG9yZGVyOiAxNjA1MDMyMTAwLCByZXZpc2lvbjogJzE2RjMyMSd9KTsKICAgICAgICAgICAgIH0p OwogICAgICAgICB9KTsKICAgICB9KTsKQEAgLTIxNCw2ICsyMTEsMTYgQEAgZGVzY3JpYmUoJ09T QnVpbGRGZXRjaGVyJywgZnVuY3Rpb24oKSB7CiAgICAgfSkKIAogICAgIGRlc2NyaWJlKCdPU0J1 aWxkRmV0Y2hlci5mZXRjaEFuZFJlcG9ydE5ld0J1aWxkcycsICgpID0+IHsKKworICAgICAgICBi ZWZvcmVFYWNoKGZ1bmN0aW9uICgpIHsKKyAgICAgICAgICAgIFRlc3RTZXJ2ZXIuZGF0YWJhc2Uo KS5jb25uZWN0KHtrZWVwQWxpdmU6IHRydWV9KTsKKyAgICAgICAgfSk7CisKKyAgICAgICAgYWZ0 ZXJFYWNoKGZ1bmN0aW9uICgpIHsKKyAgICAgICAgICAgIFRlc3RTZXJ2ZXIuZGF0YWJhc2UoKS5k aXNjb25uZWN0KCk7CisgICAgICAgIH0pOworCisKICAgICAgICAgaXQoJ3Nob3VsZCByZXBvcnQg YWxsIGJ1aWxkIGNvbW1pdHMgd2l0aCBzdWItY29tbWl0cycsICgpID0+IHsKICAgICAgICAgICAg IGNvbnN0IGxvZ2dlciA9IG5ldyBNb2NrTG9nZ2VyOwogICAgICAgICAgICAgY29uc3QgZmV0Y2h0 ZXIgPSBuZXcgT1NCdWlsZEZldGNoZXIoY29uZmlnLCBUZXN0U2VydmVyLnJlbW90ZUFQSSgpLCBz bGF2ZUF1dGgsIE1vY2tTdWJwcm9jZXNzLCBsb2dnZXIpOwpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMv cGVyZi53ZWJraXQub3JnL3Rvb2xzL3B1bGwtb3MtdmVyc2lvbnMuanMgYi9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvdG9vbHMvcHVsbC1vcy12ZXJzaW9ucy5qcwppbmRleCBkYTI0NTU3Nzk3YmFj MjVjZWY3YTUyYTY3M2M1MzY1ZTRhMDEwNTRlLi4xMTc1MGM4OGM2YWFkN2ZiNDNhNWNiODk4N2Yz YjEwNDc2MTA2NWVkIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMv cHVsbC1vcy12ZXJzaW9ucy5qcworKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMv cHVsbC1vcy12ZXJzaW9ucy5qcwpAQCAtMjYsMTAgKzI2LDEzIEBAIGZ1bmN0aW9uIHN5bmNMb29w KG9wdGlvbnMpCiAgICAgbGV0IG9zQ29uZmlnTGlzdCA9IEpTT04ucGFyc2UoZnMucmVhZEZpbGVT eW5jKG9wdGlvbnNbJy0tb3MtY29uZmlnLWpzb24nXSwgJ3V0ZjgnKSk7CiAgICAgbGV0IHNlcnZl ckNvbmZpZyA9IEpTT04ucGFyc2UoZnMucmVhZEZpbGVTeW5jKG9wdGlvbnNbJy0tc2VydmVyLWNv bmZpZy1qc29uJ10sICd1dGY4JykpOwogCi0gICAgLy8gdjMgbW9kZWxzIHVzZSB0aGUgZ2xvYmFs IFJlbW90ZUFQSSB0byBhY2Nlc3MgdGhlIHBlcmYgZGFzaGJvYXJkLgotICAgIGdsb2JhbC5SZW1v dGVBUEkgPSBuZXcgUmVtb3RlQVBJKHNlcnZlckNvbmZpZy5zZXJ2ZXIpOworICAgIGNvbnN0IHJl bW90ZUFQSSA9IG5ldyBSZW1vdGVBUEkoc2VydmVyQ29uZmlnLnNlcnZlcik7CiAKLSAgICBQcm9t aXNlLmFsbChvc0NvbmZpZ0xpc3QubWFwKG9zQ29uZmlnID0+IG5ldyBPU0J1aWxkRmV0Y2hlcihv c0NvbmZpZywgZ2xvYmFsLlJlbW90ZUFQSSwgbmV3IFN1YnByb2Nlc3MsIHNlcnZlckNvbmZpZy5z bGF2ZSwgY29uc29sZSkpKS5jYXRjaCgoZXJyb3IpID0+IHsKKyAgICBQcm9taXNlLmFsbChvc0Nv bmZpZ0xpc3QubWFwKG9zQ29uZmlnID0+IG5ldyBPU0J1aWxkRmV0Y2hlcihvc0NvbmZpZywgcmVt b3RlQVBJLCBzZXJ2ZXJDb25maWcuc2xhdmUsIG5ldyBTdWJwcm9jZXNzLCBjb25zb2xlKSkpLnRo ZW4oKGZldGNoZXJzKSA9PiB7CisgICAgICAgIHJldHVybiBmZXRjaGVycy5yZWR1Y2UoKHByb21p c2UsIGZldGNoZXIpID0+IHsKKyAgICAgICAgICAgIHJldHVybiBwcm9taXNlLnRoZW4oZmV0Y2hl ci5mZXRjaEFuZFJlcG9ydE5ld0J1aWxkcygpKTsKKyAgICAgICAgfSwgUHJvbWlzZS5yZXNvbHZl KCkpOworICAgIH0pLmNhdGNoKChlcnJvcikgPT4gewogICAgICAgICBjb25zb2xlLmVycm9yKGVy cm9yKTsKICAgICAgICAgaWYgKHR5cGVvZihlcnJvci5zdGFjaykgPT0gJ3N0cmluZycpIHsKICAg ICAgICAgICAgIGZvciAobGV0IGxpbmUgb2YgZXJyb3Iuc3RhY2suc3BsaXQoJ1xuJykpCg== 304609 2017-03-15 22:06:46 -0700 2017-03-15 22:48:54 -0700 Patch bug-169701-20170315220644.patch text/plain 4742 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0MDEwCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBhMTJjYmJlMzFlZTk4MWZhNzliZjQ1MDY3ZGI4ZTM1MjBkNTUwMTNiLi45NjY3YzhlNDhh YTE2MzE0NDdkOWY1M2RkYjIyNjFiODliYWEzZTY5IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxNy0wMy0xNSAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBGaXggdW5pdCB0ZXN0IGFuZCBidWcgZml4IGZvciAncHVs bC1vcy12ZXJzaW9ucy5qcycgc2NyaXB0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTY5NzAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRml4IHVuaXQgdGVzdHMgd2FybmluZ3Mgb24gbm9kZS02LjEwLjAu CisgICAgICAgIEZpeCAncHVsbC1vcy12ZXJzaW9ucy5qcycgZG9lcyBub3QgZmV0Y2ggbmV3IGJ1 aWxkcyBhbmQgcmVwb3J0LgorCisgICAgICAgICogc2VydmVyLXRlc3RzL3Rvb2xzLW9zLWJ1aWxk LWZldGNoZXItdGVzdHMuanM6CisgICAgICAgICh0aGVuKToKKyAgICAgICAgKGJlZm9yZUVhY2gp OgorICAgICAgICAoYWZ0ZXJFYWNoKToKKyAgICAgICAgKiB0b29scy9wdWxsLW9zLXZlcnNpb25z LmpzOgorICAgICAgICAoc3luY0xvb3ApOgorCiAyMDE3LTAzLTE1ICBSeW9zdWtlIE5pd2EgIDxy bml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIEluLWJyb3dzZXIgYW5kIG5vZGUuanMgaW1wbGVt ZW50YXRpb25zIG9mIFJlbW90ZUFQSSBzaG91bGQgc2hhcmUgc29tZSBjb2RlCmRpZmYgLS1naXQg YS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRlc3RzL3Rvb2xzLW9zLWJ1aWxkLWZl dGNoZXItdGVzdHMuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRlc3RzL3Rv b2xzLW9zLWJ1aWxkLWZldGNoZXItdGVzdHMuanMKaW5kZXggNTZiY2Q1OTk3MzVjN2I4MjAxMmVl ZjAyNDdiNmE2ZmI2MGJhNDQxNC4uZGVmYTA2MDNhYjE0MjMzOTI0ZDUzMmY2MzU5NDc0M2I2ZmUw OWM0YSAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy90 b29scy1vcy1idWlsZC1mZXRjaGVyLXRlc3RzLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9zZXJ2ZXItdGVzdHMvdG9vbHMtb3MtYnVpbGQtZmV0Y2hlci10ZXN0cy5qcwpAQCAtMTIs NyArMTIsOCBAQCBjb25zdCBNb2NrTG9nZ2VyID0gcmVxdWlyZSgnLi9yZXNvdXJjZXMvbW9jay1s b2dnZXIuanMnKS5Nb2NrTG9nZ2VyOwogCiAKIGRlc2NyaWJlKCdPU0J1aWxkRmV0Y2hlcicsIGZ1 bmN0aW9uKCkgewotICAgIHByZXBhcmVTZXJ2ZXJUZXN0KHRoaXMpOworICAgIHRoaXMudGltZW91 dCg1MDAwKTsKKyAgICBUZXN0U2VydmVyLmluamVjdCgpOwogCiAgICAgYmVmb3JlRWFjaChmdW5j dGlvbiAoKSB7CiAgICAgICAgIE1vY2tSZW1vdGVBUEkucmVzZXQoJ2h0dHA6Ly9idWlsZC53ZWJr aXQub3JnJyk7CkBAIC0zNCw3ICszNSw3IEBAIGRlc2NyaWJlKCdPU0J1aWxkRmV0Y2hlcicsIGZ1 bmN0aW9uKCkgewogICAgIH07CiAKICAgICBjb25zdCBhbm90aGVyU3ViQ29tbWl0V2l0aFdlYktp dCA9IHsKLSAgICAgICAgJ1dlYktpdCc6IHsncmV2aXNpb24nOiAnMTQxOTk5Jyx9CisgICAgICAg ICdXZWJLaXQnOiB7J3JldmlzaW9uJzogJzE0MTk5OSd9CiAgICAgfTsKIAogICAgIGNvbnN0IGFu b3RoZXJTdWJDb21taXRXaXRoV2ViS2l0QW5kSmF2YVNjcmlwdENvcmUgPSB7CkBAIC0xMzIsMTIg KzEzMyw4IEBAIGRlc2NyaWJlKCdPU0J1aWxkRmV0Y2hlcicsIGZ1bmN0aW9uKCkgewogICAgICAg ICAgICAgICAgIHJldHVybiBmZXRjaENvbW1pdHNQcm9taXNlOwogICAgICAgICAgICAgfSkudGhl bigocmVzdWx0cykgPT4gewogICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZXN1bHRzLmxl bmd0aCwgMik7Ci0gICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHJlc3VsdHNbMF1bJ3JlcG9z aXRvcnknXSwgJ09TWCcpOwotICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZXN1bHRzWzBd WydyZXZpc2lvbiddLCAnMTZFMzIxeicpOwotICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChy ZXN1bHRzWzBdWydvcmRlciddLCAxNjA0MDMyMTI2KTsKLSAgICAgICAgICAgICAgICBhc3NlcnQu ZXF1YWwocmVzdWx0c1sxXVsncmVwb3NpdG9yeSddLCAnT1NYJyk7Ci0gICAgICAgICAgICAgICAg YXNzZXJ0LmVxdWFsKHJlc3VsdHNbMV1bJ3JldmlzaW9uJ10sICcxNkYzMjEnKTsKLSAgICAgICAg ICAgICAgICBhc3NlcnQuZXF1YWwocmVzdWx0c1sxXVsnb3JkZXInXSwgMTYwNTAzMjEwMCk7Cisg ICAgICAgICAgICAgICAgYXNzZXJ0LmRlZXBFcXVhbChyZXN1bHRzWzBdLCB7cmVwb3NpdG9yeTog J09TWCcsIG9yZGVyOiAxNjA0MDMyMTI2LCByZXZpc2lvbjogJzE2RTMyMXonfSk7CisgICAgICAg ICAgICAgICAgYXNzZXJ0LmRlZXBFcXVhbChyZXN1bHRzWzFdLCB7cmVwb3NpdG9yeTogJ09TWCcs IG9yZGVyOiAxNjA1MDMyMTAwLCByZXZpc2lvbjogJzE2RjMyMSd9KTsKICAgICAgICAgICAgIH0p OwogICAgICAgICB9KTsKICAgICB9KTsKQEAgLTIxNCw2ICsyMTEsMTYgQEAgZGVzY3JpYmUoJ09T QnVpbGRGZXRjaGVyJywgZnVuY3Rpb24oKSB7CiAgICAgfSkKIAogICAgIGRlc2NyaWJlKCdPU0J1 aWxkRmV0Y2hlci5mZXRjaEFuZFJlcG9ydE5ld0J1aWxkcycsICgpID0+IHsKKworICAgICAgICBi ZWZvcmVFYWNoKGZ1bmN0aW9uICgpIHsKKyAgICAgICAgICAgIFRlc3RTZXJ2ZXIuZGF0YWJhc2Uo KS5jb25uZWN0KHtrZWVwQWxpdmU6IHRydWV9KTsKKyAgICAgICAgfSk7CisKKyAgICAgICAgYWZ0 ZXJFYWNoKGZ1bmN0aW9uICgpIHsKKyAgICAgICAgICAgIFRlc3RTZXJ2ZXIuZGF0YWJhc2UoKS5k aXNjb25uZWN0KCk7CisgICAgICAgIH0pOworCisKICAgICAgICAgaXQoJ3Nob3VsZCByZXBvcnQg YWxsIGJ1aWxkIGNvbW1pdHMgd2l0aCBzdWItY29tbWl0cycsICgpID0+IHsKICAgICAgICAgICAg IGNvbnN0IGxvZ2dlciA9IG5ldyBNb2NrTG9nZ2VyOwogICAgICAgICAgICAgY29uc3QgZmV0Y2h0 ZXIgPSBuZXcgT1NCdWlsZEZldGNoZXIoY29uZmlnLCBUZXN0U2VydmVyLnJlbW90ZUFQSSgpLCBz bGF2ZUF1dGgsIE1vY2tTdWJwcm9jZXNzLCBsb2dnZXIpOwpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMv cGVyZi53ZWJraXQub3JnL3Rvb2xzL3B1bGwtb3MtdmVyc2lvbnMuanMgYi9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvdG9vbHMvcHVsbC1vcy12ZXJzaW9ucy5qcwppbmRleCBkYTI0NTU3Nzk3YmFj MjVjZWY3YTUyYTY3M2M1MzY1ZTRhMDEwNTRlLi40NTAzNzFiNThmYjc2MDUzZTU4NDUwMjBlMGIy NmFiNmYxZTc2NTY5IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMv cHVsbC1vcy12ZXJzaW9ucy5qcworKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMv cHVsbC1vcy12ZXJzaW9ucy5qcwpAQCAtMjYsMTAgKzI2LDEzIEBAIGZ1bmN0aW9uIHN5bmNMb29w KG9wdGlvbnMpCiAgICAgbGV0IG9zQ29uZmlnTGlzdCA9IEpTT04ucGFyc2UoZnMucmVhZEZpbGVT eW5jKG9wdGlvbnNbJy0tb3MtY29uZmlnLWpzb24nXSwgJ3V0ZjgnKSk7CiAgICAgbGV0IHNlcnZl ckNvbmZpZyA9IEpTT04ucGFyc2UoZnMucmVhZEZpbGVTeW5jKG9wdGlvbnNbJy0tc2VydmVyLWNv bmZpZy1qc29uJ10sICd1dGY4JykpOwogCi0gICAgLy8gdjMgbW9kZWxzIHVzZSB0aGUgZ2xvYmFs IFJlbW90ZUFQSSB0byBhY2Nlc3MgdGhlIHBlcmYgZGFzaGJvYXJkLgotICAgIGdsb2JhbC5SZW1v dGVBUEkgPSBuZXcgUmVtb3RlQVBJKHNlcnZlckNvbmZpZy5zZXJ2ZXIpOworICAgIGNvbnN0IHJl bW90ZUFQSSA9IG5ldyBSZW1vdGVBUEkoc2VydmVyQ29uZmlnLnNlcnZlcik7CiAKLSAgICBQcm9t aXNlLmFsbChvc0NvbmZpZ0xpc3QubWFwKG9zQ29uZmlnID0+IG5ldyBPU0J1aWxkRmV0Y2hlcihv c0NvbmZpZywgZ2xvYmFsLlJlbW90ZUFQSSwgbmV3IFN1YnByb2Nlc3MsIHNlcnZlckNvbmZpZy5z bGF2ZSwgY29uc29sZSkpKS5jYXRjaCgoZXJyb3IpID0+IHsKKyAgICBQcm9taXNlLmFsbChvc0Nv bmZpZ0xpc3QubWFwKG9zQ29uZmlnID0+IG5ldyBPU0J1aWxkRmV0Y2hlcihvc0NvbmZpZywgcmVt b3RlQVBJLCBzZXJ2ZXJDb25maWcuc2xhdmUsIG5ldyBTdWJwcm9jZXNzLCBjb25zb2xlKSkpLnRo ZW4oKGZldGNoZXJzKSA9PiB7CisgICAgICAgIHJldHVybiBmZXRjaGVycy5yZWR1Y2UoKHByb21p c2UsIGZldGNoZXIpID0+IHsKKyAgICAgICAgICAgIHJldHVybiBwcm9taXNlLnRoZW4oKCkgPT4g e3JldHVybiBmZXRjaGVyLmZldGNoQW5kUmVwb3J0TmV3QnVpbGRzKCk7fSk7CisgICAgICAgIH0s IFByb21pc2UucmVzb2x2ZSgpKTsKKyAgICB9KS5jYXRjaCgoZXJyb3IpID0+IHsKICAgICAgICAg Y29uc29sZS5lcnJvcihlcnJvcik7CiAgICAgICAgIGlmICh0eXBlb2YoZXJyb3Iuc3RhY2spID09 ICdzdHJpbmcnKSB7CiAgICAgICAgICAgICBmb3IgKGxldCBsaW5lIG9mIGVycm9yLnN0YWNrLnNw bGl0KCdcbicpKQo= 304613 2017-03-15 22:48:58 -0700 2017-03-15 23:29:06 -0700 Patch for landing bug-169701-20170315224858.patch text/plain 5269 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0MDI5CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBhMTJjYmJlMzFlZTk4MWZhNzliZjQ1MDY3ZGI4ZTM1MjBkNTUwMTNiLi44MmVkMjYwMjI4 NjA1NWQ2M2U4NjNiOGY4ZmNlNDUxZmUxNGVjOThhIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxNy0wMy0xNSAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBGaXggdW5pdCB0ZXN0IGFuZCBidWcgZml4IGZvciAncHVs bC1vcy12ZXJzaW9ucy5qcycgc2NyaXB0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTY5NzAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBO aXdhLgorCisgICAgICAgIEZpeCB1bml0IHRlc3RzIHdhcm5pbmdzIG9uIG5vZGUtNi4xMC4wLgor ICAgICAgICBGaXggJ3B1bGwtb3MtdmVyc2lvbnMuanMnIGRvZXMgbm90IGZldGNoIG5ldyBidWls ZHMgYW5kIHJlcG9ydC4KKworICAgICAgICAqIHNlcnZlci10ZXN0cy90b29scy1vcy1idWlsZC1m ZXRjaGVyLXRlc3RzLmpzOgorICAgICAgICAodGhlbik6CisgICAgICAgIChiZWZvcmVFYWNoKToK KyAgICAgICAgKGFmdGVyRWFjaCk6CisgICAgICAgICogdG9vbHMvcHVsbC1vcy12ZXJzaW9ucy5q czoKKyAgICAgICAgKHN5bmNMb29wKToKKwogMjAxNy0wMy0xNSAgUnlvc3VrZSBOaXdhICA8cm5p d2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBJbi1icm93c2VyIGFuZCBub2RlLmpzIGltcGxlbWVu dGF0aW9ucyBvZiBSZW1vdGVBUEkgc2hvdWxkIHNoYXJlIHNvbWUgY29kZQpkaWZmIC0tZ2l0IGEv V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy90b29scy1vcy1idWlsZC1mZXRj aGVyLXRlc3RzLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy90b29s cy1vcy1idWlsZC1mZXRjaGVyLXRlc3RzLmpzCmluZGV4IDU2YmNkNTk5NzM1YzdiODIwMTJlZWYw MjQ3YjZhNmZiNjBiYTQ0MTQuLjc1OWRjMWRiZjBkMWQ0OTZjMjQ2OThiZTI3ZmM4MGY1MTRlYWJh OWQgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvdG9v bHMtb3MtYnVpbGQtZmV0Y2hlci10ZXN0cy5qcworKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5v cmcvc2VydmVyLXRlc3RzL3Rvb2xzLW9zLWJ1aWxkLWZldGNoZXItdGVzdHMuanMKQEAgLTEyLDcg KzEyLDggQEAgY29uc3QgTW9ja0xvZ2dlciA9IHJlcXVpcmUoJy4vcmVzb3VyY2VzL21vY2stbG9n Z2VyLmpzJykuTW9ja0xvZ2dlcjsKIAogCiBkZXNjcmliZSgnT1NCdWlsZEZldGNoZXInLCBmdW5j dGlvbigpIHsKLSAgICBwcmVwYXJlU2VydmVyVGVzdCh0aGlzKTsKKyAgICB0aGlzLnRpbWVvdXQo NTAwMCk7CisgICAgVGVzdFNlcnZlci5pbmplY3QoKTsKIAogICAgIGJlZm9yZUVhY2goZnVuY3Rp b24gKCkgewogICAgICAgICBNb2NrUmVtb3RlQVBJLnJlc2V0KCdodHRwOi8vYnVpbGQud2Via2l0 Lm9yZycpOwpAQCAtMzQsNyArMzUsNyBAQCBkZXNjcmliZSgnT1NCdWlsZEZldGNoZXInLCBmdW5j dGlvbigpIHsKICAgICB9OwogCiAgICAgY29uc3QgYW5vdGhlclN1YkNvbW1pdFdpdGhXZWJLaXQg PSB7Ci0gICAgICAgICdXZWJLaXQnOiB7J3JldmlzaW9uJzogJzE0MTk5OScsfQorICAgICAgICAn V2ViS2l0JzogeydyZXZpc2lvbic6ICcxNDE5OTknfQogICAgIH07CiAKICAgICBjb25zdCBhbm90 aGVyU3ViQ29tbWl0V2l0aFdlYktpdEFuZEphdmFTY3JpcHRDb3JlID0gewpAQCAtMTAyLDYgKzEw Myw4IEBAIGRlc2NyaWJlKCdPU0J1aWxkRmV0Y2hlcicsIGZ1bmN0aW9uKCkgewogICAgICAgICAg ICAgYXNzZXJ0LmVxdWFsKGZldGNoZXIuX2NvbXB1dGVPcmRlcignMTZkMzIxJyksIDE2MDMwMzIx MDApOwogICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKGZldGNoZXIuX2NvbXB1dGVPcmRlcignMTZE MzIxeicpLCAxNjAzMDMyMTI2KTsKICAgICAgICAgICAgIGFzc2VydC5lcXVhbChmZXRjaGVyLl9j b21wdXRlT3JkZXIoJzE2ZDMyMVonKSwgMTYwMzAzMjEyNik7CisgICAgICAgICAgICBhc3NlcnQu ZXF1YWwoZmV0Y2hlci5fY29tcHV0ZU9yZGVyKCcxMC4xMi4zIDE2RDMyJyksIDE2MDMwMDMyMDAp OworICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKGZldGNoZXIuX2NvbXB1dGVPcmRlcignMTAuMTIu MyBTaWVycmExNkQzMicpLCAxNjAzMDAzMjAwKTsKICAgICAgICAgfSk7CiAKICAgICAgICAgaXQo J3Nob3VsZCB0aHJvdyBhc3NlcnRpb24gZXJyb3Igd2hlbiBnaXZlbiBhIGludmFsaWQgcmV2aXNp b24nLCAoKSA9PiB7CkBAIC0xMzIsMTIgKzEzNSw4IEBAIGRlc2NyaWJlKCdPU0J1aWxkRmV0Y2hl cicsIGZ1bmN0aW9uKCkgewogICAgICAgICAgICAgICAgIHJldHVybiBmZXRjaENvbW1pdHNQcm9t aXNlOwogICAgICAgICAgICAgfSkudGhlbigocmVzdWx0cykgPT4gewogICAgICAgICAgICAgICAg IGFzc2VydC5lcXVhbChyZXN1bHRzLmxlbmd0aCwgMik7Ci0gICAgICAgICAgICAgICAgYXNzZXJ0 LmVxdWFsKHJlc3VsdHNbMF1bJ3JlcG9zaXRvcnknXSwgJ09TWCcpOwotICAgICAgICAgICAgICAg IGFzc2VydC5lcXVhbChyZXN1bHRzWzBdWydyZXZpc2lvbiddLCAnMTZFMzIxeicpOwotICAgICAg ICAgICAgICAgIGFzc2VydC5lcXVhbChyZXN1bHRzWzBdWydvcmRlciddLCAxNjA0MDMyMTI2KTsK LSAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVzdWx0c1sxXVsncmVwb3NpdG9yeSddLCAn T1NYJyk7Ci0gICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHJlc3VsdHNbMV1bJ3JldmlzaW9u J10sICcxNkYzMjEnKTsKLSAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVzdWx0c1sxXVsn b3JkZXInXSwgMTYwNTAzMjEwMCk7CisgICAgICAgICAgICAgICAgYXNzZXJ0LmRlZXBFcXVhbChy ZXN1bHRzWzBdLCB7cmVwb3NpdG9yeTogJ09TWCcsIG9yZGVyOiAxNjA0MDMyMTI2LCByZXZpc2lv bjogJzE2RTMyMXonfSk7CisgICAgICAgICAgICAgICAgYXNzZXJ0LmRlZXBFcXVhbChyZXN1bHRz WzFdLCB7cmVwb3NpdG9yeTogJ09TWCcsIG9yZGVyOiAxNjA1MDMyMTAwLCByZXZpc2lvbjogJzE2 RjMyMSd9KTsKICAgICAgICAgICAgIH0pOwogICAgICAgICB9KTsKICAgICB9KTsKQEAgLTIxNCw2 ICsyMTMsMTYgQEAgZGVzY3JpYmUoJ09TQnVpbGRGZXRjaGVyJywgZnVuY3Rpb24oKSB7CiAgICAg fSkKIAogICAgIGRlc2NyaWJlKCdPU0J1aWxkRmV0Y2hlci5mZXRjaEFuZFJlcG9ydE5ld0J1aWxk cycsICgpID0+IHsKKworICAgICAgICBiZWZvcmVFYWNoKGZ1bmN0aW9uICgpIHsKKyAgICAgICAg ICAgIFRlc3RTZXJ2ZXIuZGF0YWJhc2UoKS5jb25uZWN0KHtrZWVwQWxpdmU6IHRydWV9KTsKKyAg ICAgICAgfSk7CisKKyAgICAgICAgYWZ0ZXJFYWNoKGZ1bmN0aW9uICgpIHsKKyAgICAgICAgICAg IFRlc3RTZXJ2ZXIuZGF0YWJhc2UoKS5kaXNjb25uZWN0KCk7CisgICAgICAgIH0pOworCisKICAg ICAgICAgaXQoJ3Nob3VsZCByZXBvcnQgYWxsIGJ1aWxkIGNvbW1pdHMgd2l0aCBzdWItY29tbWl0 cycsICgpID0+IHsKICAgICAgICAgICAgIGNvbnN0IGxvZ2dlciA9IG5ldyBNb2NrTG9nZ2VyOwog ICAgICAgICAgICAgY29uc3QgZmV0Y2h0ZXIgPSBuZXcgT1NCdWlsZEZldGNoZXIoY29uZmlnLCBU ZXN0U2VydmVyLnJlbW90ZUFQSSgpLCBzbGF2ZUF1dGgsIE1vY2tTdWJwcm9jZXNzLCBsb2dnZXIp OwpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xzL3B1bGwtb3MtdmVy c2lvbnMuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvcHVsbC1vcy12ZXJzaW9u cy5qcwppbmRleCBkYTI0NTU3Nzk3YmFjMjVjZWY3YTUyYTY3M2M1MzY1ZTRhMDEwNTRlLi5kOTk5 MTBhNjdiOTg2YmM3MjYxNWJhNWZiZTQzODI3Y2FkYmE0OTU1IDEwMDY0NAotLS0gYS9XZWJzaXRl cy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvcHVsbC1vcy12ZXJzaW9ucy5qcworKysgYi9XZWJzaXRl cy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvcHVsbC1vcy12ZXJzaW9ucy5qcwpAQCAtMjYsMTAgKzI2 LDEzIEBAIGZ1bmN0aW9uIHN5bmNMb29wKG9wdGlvbnMpCiAgICAgbGV0IG9zQ29uZmlnTGlzdCA9 IEpTT04ucGFyc2UoZnMucmVhZEZpbGVTeW5jKG9wdGlvbnNbJy0tb3MtY29uZmlnLWpzb24nXSwg J3V0ZjgnKSk7CiAgICAgbGV0IHNlcnZlckNvbmZpZyA9IEpTT04ucGFyc2UoZnMucmVhZEZpbGVT eW5jKG9wdGlvbnNbJy0tc2VydmVyLWNvbmZpZy1qc29uJ10sICd1dGY4JykpOwogCi0gICAgLy8g djMgbW9kZWxzIHVzZSB0aGUgZ2xvYmFsIFJlbW90ZUFQSSB0byBhY2Nlc3MgdGhlIHBlcmYgZGFz aGJvYXJkLgotICAgIGdsb2JhbC5SZW1vdGVBUEkgPSBuZXcgUmVtb3RlQVBJKHNlcnZlckNvbmZp Zy5zZXJ2ZXIpOworICAgIGNvbnN0IHJlbW90ZUFQSSA9IG5ldyBSZW1vdGVBUEkoc2VydmVyQ29u ZmlnLnNlcnZlcik7CiAKLSAgICBQcm9taXNlLmFsbChvc0NvbmZpZ0xpc3QubWFwKG9zQ29uZmln ID0+IG5ldyBPU0J1aWxkRmV0Y2hlcihvc0NvbmZpZywgZ2xvYmFsLlJlbW90ZUFQSSwgbmV3IFN1 YnByb2Nlc3MsIHNlcnZlckNvbmZpZy5zbGF2ZSwgY29uc29sZSkpKS5jYXRjaCgoZXJyb3IpID0+ IHsKKyAgICBQcm9taXNlLmFsbChvc0NvbmZpZ0xpc3QubWFwKG9zQ29uZmlnID0+IG5ldyBPU0J1 aWxkRmV0Y2hlcihvc0NvbmZpZywgcmVtb3RlQVBJLCBzZXJ2ZXJDb25maWcuc2xhdmUsIG5ldyBT dWJwcm9jZXNzLCBjb25zb2xlKSkpLnRoZW4oKGZldGNoZXJzKSA9PiB7CisgICAgICAgIHJldHVy biBmZXRjaGVycy5yZWR1Y2UoKHByb21pc2UsIGZldGNoZXIpID0+IHsKKyAgICAgICAgICAgIHJl dHVybiBwcm9taXNlLnRoZW4oKCkgPT4gZmV0Y2hlci5mZXRjaEFuZFJlcG9ydE5ld0J1aWxkcygp KTsKKyAgICAgICAgfSwgUHJvbWlzZS5yZXNvbHZlKCkpOworICAgIH0pLmNhdGNoKChlcnJvcikg PT4gewogICAgICAgICBjb25zb2xlLmVycm9yKGVycm9yKTsKICAgICAgICAgaWYgKHR5cGVvZihl cnJvci5zdGFjaykgPT0gJ3N0cmluZycpIHsKICAgICAgICAgICAgIGZvciAobGV0IGxpbmUgb2Yg ZXJyb3Iuc3RhY2suc3BsaXQoJ1xuJykpCg==