199945 2019-07-19 08:52:19 -0700 [webkitpy] Allow the testrunner driver to setup the environment completely without needing to start the server process. 2019-07-22 07:25:07 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=199855 InRadar P2 Normal --- 1 clopez clopez achristensen bugs-noreply cgarcia ews-watchlist glenn mcatanzaro pnormand webkit-bug-importer zan oldest_to_newest 1554215 0 clopez 2019-07-19 08:52:19 -0700 Since bug 199855 the GTK and WPE testrunner drivers share more code with the base driver. The scripts run-gtk-tests / run-wpe-tests, run-webdriver-tests and run-web-platform-tests need to setup the testrunner driver environment (to maybe start Xvfb or setup needed environment variables). But those scripts don't need the WebTestRunner server process running. Previous to bug 199855 this scripts where setting only the environment variables that don't depend on the Driver tempdir (because this one is created when the driver is started), but starting the driver also executes the server process. I think its desirable to refactor the code to allow creating the driver tempdir and setup the environment completely without needing to start the server process. 1554225 1 374468 clopez 2019-07-19 09:11:31 -0700 Created attachment 374468 Patch 1554426 2 374468 clopez 2019-07-19 17:55:56 -0700 Comment on attachment 374468 Patch Clearing flags on attachment: 374468 Committed r247663: <https://trac.webkit.org/changeset/247663> 1554427 3 clopez 2019-07-19 17:56:00 -0700 All reviewed patches have been landed. Closing bug. 1554428 4 webkit-bug-importer 2019-07-19 17:56:16 -0700 <rdar://problem/53332564> 1554677 5 clopez 2019-07-22 06:52:11 -0700 On further thinking, it seems to me that is also worth also adding an unit test for this. 1554680 6 374597 clopez 2019-07-22 07:10:45 -0700 Created attachment 374597 Patch 1554684 7 374597 mcatanzaro 2019-07-22 07:19:34 -0700 Comment on attachment 374597 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374597&action=review > Tools/Scripts/webkitpy/port/driver_unittest.py:396 > + self.assertNotEqual(environ_driver[var], None) > + > + > def test_create_temporal_home_dir(self): All the other surrounding functions have only one line between them (though I thought two was supposed to be standard for python). 1554686 8 clopez 2019-07-22 07:25:07 -0700 Committed r247682: <https://trac.webkit.org/changeset/247682> 374468 2019-07-19 09:11:31 -0700 2019-07-22 07:10:34 -0700 Patch bug-199945-20190719181129.patch text/plain 7732 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3NjQ3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjBjYTdkYzNlNjE3MjNiMTZlZmZmNGQxZGQ3MjczZmUy N2E0NjIyYS4uMTMyODVmMTQ0ZTJhNTAzMzhiNmIxYTFhNDkyODRlN2Q2NDIwYjEzMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDE5LTA3LTE5ICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFt3ZWJraXRweV0gQWxsb3cgdGhlIHRlc3RydW5uZXIgZHJpdmVy IHRvIHNldHVwIHRoZSBlbnZpcm9ubWVudCBjb21wbGV0ZWx5IHdpdGhvdXQgbmVlZGluZyB0byBz dGFydCB0aGUgc2VydmVyIHByb2Nlc3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xOTk5NDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBSZWZhY3RvciB0aGUgY29kZSB0byBjcmVhdGUgdGhlIERyaXZlciB0 ZW1wb3JhbCBkaXJlY3RvcmllcyBpbnNpZGUgRHJpdmVyLl9zZXR1cF9lbnZpcm9uX2Zvcl9kcml2 ZXIoKS4KKyAgICAgICAgVGhpcyBhbGxvd3MgZXh0ZXJuYWwgY2FsbGVycyB0byBzZXR1cCB0aGUg ZW52aXJvbm1lbnQgZm9yIHJ1bm5pbmcgdGVzdHMgYnkgY2FsbGluZyB0aGF0IG1ldGhvZCB3aXRo b3V0IG5lZWRpbmcgdG8gc3RhcnQgdGhlIHNlcnZlciBwcm9jZXNzLgorICAgICAgICBXaGVuIHRo aXMgY2FsbGVycyBmaW5pc2ggdGVzdGluZywgaXQgaXMgZW5vdWdoIHdpdGggY2FsbGluZyBlaXRo ZXIgRHJpdmVyLnN0b3AoKSBvciBEcml2ZXIuX2RlbGV0ZV90ZW1wb3JhbF9kaXJlY3Rvcmllcygp LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weToKKyAgICAgICAg KERyaXZlci5fc2V0dXBfZW52aXJvbl9mb3JfZHJpdmVyKToKKyAgICAgICAgKERyaXZlci5fY3Jl YXRlX3RlbXBvcmFsX2RpcmVjdG9yaWVzKToKKyAgICAgICAgKERyaXZlcik6CisgICAgICAgIChE cml2ZXIuX3N0YXJ0KToKKyAgICAgICAgKERyaXZlci5fZGVsZXRlX3RlbXBvcmFsX2RpcmVjdG9y aWVzKToKKyAgICAgICAgKERyaXZlci5zdG9wKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L3czYy93cHRfcnVubmVyLnB5OiBOb3QgbmVlZGVkIGFueW1vcmUgdG8gc3RhcnQgdGhlIGRyaXZl ciBzaW5jZSB0aGlzIGRvZXNudCBuZWVkIHRoZSBzZXJ2ZXIgcHJvY2VzcyBydW5uaW5nLgorICAg ICAgICAobWFpbik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS93ZWJkcml2ZXJfdGVzdHMv d2ViZHJpdmVyX3Rlc3RfcnVubmVyLnB5OiBEaXR0by4KKyAgICAgICAgKFdlYkRyaXZlclRlc3RS dW5uZXIuX19pbml0X18pOgorICAgICAgICAqIGdsaWIvYXBpX3Rlc3RfcnVubmVyLnB5OgorICAg ICAgICAoVGVzdFJ1bm5lci5fc2V0dXBfdGVzdGluZ19lbnZpcm9ubWVudCk6IERpdHRvLgorCiAy MDE5LTA3LTE5ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAg ICBbZXdzLWJ1aWxkXSBEaXNwbGF5IHByZS1leGlzdGluZyBMYXlvdXQgdGVzdCBmYWlsdXJlIG5h bWVzIGluIHRoZSBidWlsZCBzdW1tYXJ5CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3BvcnQvZHJpdmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5w eQppbmRleCBiMTk2ZDZjNWU0NDI1MzY1ZTdhMDU4ZWI0ZDYyNzYyMGRjZDViYWQxLi4xYjFkMmRj M2RlZmMyMmRiMDcyNzY2YzY5ODU5NmIwNzk3ZTU2YzZiIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC9kcml2ZXIucHkKQEAgLTQxMCw2ICs0MTAsOCBAQCBjbGFzcyBEcml2ZXIob2JqZWN0KToK ICAgICAgICAgICAgIGVudmlyb25tZW50W3ZhcmlhYmxlXSA9IHBhdGgKIAogICAgIGRlZiBfc2V0 dXBfZW52aXJvbl9mb3JfZHJpdmVyKHNlbGYsIGVudmlyb25tZW50KToKKyAgICAgICAgc2VsZi5f cG9ydC5fY2xlYXJfZ2xvYmFsX2NhY2hlc19hbmRfdGVtcG9yYXJ5X2ZpbGVzKCkKKyAgICAgICAg c2VsZi5fY3JlYXRlX3RlbXBvcmFsX2RpcmVjdG9yaWVzKCkKICAgICAgICAgYnVpbGRfcm9vdF9w YXRoID0gc3RyKHNlbGYuX3BvcnQuX2J1aWxkX3BhdGgoKSkKICAgICAgICAgc2VsZi5fYXBwZW5k X2Vudmlyb25tZW50X3ZhcmlhYmxlX3BhdGgoZW52aXJvbm1lbnQsICdEWUxEX0xJQlJBUllfUEFU SCcsIGJ1aWxkX3Jvb3RfcGF0aCkKICAgICAgICAgc2VsZi5fYXBwZW5kX2Vudmlyb25tZW50X3Zh cmlhYmxlX3BhdGgoZW52aXJvbm1lbnQsICdfX1hQQ19EWUxEX0xJQlJBUllfUEFUSCcsIGJ1aWxk X3Jvb3RfcGF0aCkKQEAgLTQ1MSwxNyArNDUzLDE5IEBAIGNsYXNzIERyaXZlcihvYmplY3QpOgog ICAgICAgICBlbnZpcm9ubWVudCA9IHNlbGYuX3NldHVwX2Vudmlyb25fZm9yX2RyaXZlcihlbnZp cm9ubWVudCkKICAgICAgICAgcmV0dXJuIGVudmlyb25tZW50CiAKLSAgICBkZWYgX3N0YXJ0KHNl bGYsIHBpeGVsX3Rlc3RzLCBwZXJfdGVzdF9hcmdzKToKLSAgICAgICAgc2VsZi5zdG9wKCkKKyAg ICBkZWYgX2NyZWF0ZV90ZW1wb3JhbF9kaXJlY3RvcmllcyhzZWxmKToKICAgICAgICAgIyBFYWNo IGRyaXZlciBwcm9jZXNzIHNob3VsZCBiZSB1c2luZyBpbmRpdmlkdWFsIGRpcmVjdG9yaWVzIHVu ZGVyIF9kcml2ZXJfdGVtcGRpciAod2hpY2ggaXMgZGVsZXRlZCB3aGVuIHN0b3BwaW5nKSwKICAg ICAgICAgIyBob3dldmVyIHNvbWUgc3Vic3lzdGVtcyBvbiBzb21lIHBsYXRmb3JtcyBjb3VsZCBl bmQgdXAgdXNpbmcgcHJvY2VzcyBkZWZhdWx0IG9uZXMuCi0gICAgICAgIHNlbGYuX3BvcnQuX2Ns ZWFyX2dsb2JhbF9jYWNoZXNfYW5kX3RlbXBvcmFyeV9maWxlcygpCi0gICAgICAgIHNlbGYuX2Ry aXZlcl90ZW1wZGlyID0gc2VsZi5fcG9ydC5fZHJpdmVyX3RlbXBkaXIoc2VsZi5fdGFyZ2V0X2hv c3QpCi0gICAgICAgIHNlbGYuX2RyaXZlcl91c2VyX2RpcmVjdG9yeV9zdWZmaXggPSBvcy5wYXRo LmJhc2VuYW1lKHN0cihzZWxmLl9kcml2ZXJfdGVtcGRpcikpCi0gICAgICAgIHVzZXJfY2FjaGVf ZGlyZWN0b3J5ID0gc2VsZi5fcG9ydC5fcGF0aF90b191c2VyX2NhY2hlX2RpcmVjdG9yeShzZWxm Ll9kcml2ZXJfdXNlcl9kaXJlY3Rvcnlfc3VmZml4KQotICAgICAgICBpZiB1c2VyX2NhY2hlX2Rp cmVjdG9yeToKLSAgICAgICAgICAgIHNlbGYuX3RhcmdldF9ob3N0LmZpbGVzeXN0ZW0ubWF5YmVf bWFrZV9kaXJlY3RvcnkodXNlcl9jYWNoZV9kaXJlY3RvcnkpCi0gICAgICAgICAgICBzZWxmLl9k cml2ZXJfdXNlcl9jYWNoZV9kaXJlY3RvcnkgPSB1c2VyX2NhY2hlX2RpcmVjdG9yeQorICAgICAg ICBpZiBzZWxmLl9kcml2ZXJfdGVtcGRpciBpcyBOb25lOgorICAgICAgICAgICAgc2VsZi5fZHJp dmVyX3RlbXBkaXIgPSBzZWxmLl9wb3J0Ll9kcml2ZXJfdGVtcGRpcihzZWxmLl90YXJnZXRfaG9z dCkKKyAgICAgICAgICAgIHNlbGYuX2RyaXZlcl91c2VyX2RpcmVjdG9yeV9zdWZmaXggPSBvcy5w YXRoLmJhc2VuYW1lKHN0cihzZWxmLl9kcml2ZXJfdGVtcGRpcikpCisgICAgICAgICAgICB1c2Vy X2NhY2hlX2RpcmVjdG9yeSA9IHNlbGYuX3BvcnQuX3BhdGhfdG9fdXNlcl9jYWNoZV9kaXJlY3Rv cnkoc2VsZi5fZHJpdmVyX3VzZXJfZGlyZWN0b3J5X3N1ZmZpeCkKKyAgICAgICAgICAgIGlmIHVz ZXJfY2FjaGVfZGlyZWN0b3J5OgorICAgICAgICAgICAgICAgIHNlbGYuX3RhcmdldF9ob3N0LmZp bGVzeXN0ZW0ubWF5YmVfbWFrZV9kaXJlY3RvcnkodXNlcl9jYWNoZV9kaXJlY3RvcnkpCisgICAg ICAgICAgICAgICAgc2VsZi5fZHJpdmVyX3VzZXJfY2FjaGVfZGlyZWN0b3J5ID0gdXNlcl9jYWNo ZV9kaXJlY3RvcnkKKworICAgIGRlZiBfc3RhcnQoc2VsZiwgcGl4ZWxfdGVzdHMsIHBlcl90ZXN0 X2FyZ3MpOgorICAgICAgICBzZWxmLnN0b3AoKQogICAgICAgICBlbnZpcm9ubWVudCA9IHNlbGYu X3NldHVwX2Vudmlyb25fZm9yX3Rlc3QoKQogICAgICAgICBzZWxmLl9jcmFzaGVkX3Byb2Nlc3Nf bmFtZSA9IE5vbmUKICAgICAgICAgc2VsZi5fY3Jhc2hlZF9waWQgPSBOb25lCkBAIC00NzcsMTMg KzQ4MSw3IEBAIGNsYXNzIERyaXZlcihvYmplY3QpOgogICAgICAgICAjIFJlbW90ZSBkcml2ZXJz IHdpbGwgb3ZlcnJpZGUgdGhpcyBtZXRob2QgdG8gcmV0dXJuIHRoZSBwaWQgb24gdGhlIGRldmlj ZS4KICAgICAgICAgcmV0dXJuIHNlbGYuX3NlcnZlcl9wcm9jZXNzLnBpZCgpCiAKLSAgICBkZWYg c3RvcChzZWxmKToKLSAgICAgICAgaWYgc2VsZi5fc2VydmVyX3Byb2Nlc3M6Ci0gICAgICAgICAg ICBzZWxmLl9zZXJ2ZXJfcHJvY2Vzcy5zdG9wKHNlbGYuX3BvcnQuZHJpdmVyX3N0b3BfdGltZW91 dCgpKQotICAgICAgICAgICAgc2VsZi5fc2VydmVyX3Byb2Nlc3MgPSBOb25lCi0gICAgICAgICAg ICBpZiBzZWxmLl9wcm9maWxlcjoKLSAgICAgICAgICAgICAgICBzZWxmLl9wcm9maWxlci5wcm9m aWxlX2FmdGVyX2V4aXQoKQotCisgICAgZGVmIF9kZWxldGVfdGVtcG9yYWxfZGlyZWN0b3JpZXMo c2VsZik6CiAgICAgICAgIGlmIHNlbGYuX2RyaXZlcl90ZW1wZGlyOgogICAgICAgICAgICAgc2Vs Zi5fdGFyZ2V0X2hvc3QuZmlsZXN5c3RlbS5ybXRyZWUoc3RyKHNlbGYuX2RyaXZlcl90ZW1wZGly KSkKICAgICAgICAgICAgIHNlbGYuX2RyaXZlcl90ZW1wZGlyID0gTm9uZQpAQCAtNDkxLDYgKzQ4 OSwxNCBAQCBjbGFzcyBEcml2ZXIob2JqZWN0KToKICAgICAgICAgICAgIHNlbGYuX3RhcmdldF9o b3N0LmZpbGVzeXN0ZW0ucm10cmVlKHNlbGYuX2RyaXZlcl91c2VyX2NhY2hlX2RpcmVjdG9yeSkK ICAgICAgICAgICAgIHNlbGYuX2RyaXZlcl91c2VyX2NhY2hlX2RpcmVjdG9yeSA9IE5vbmUKIAor ICAgIGRlZiBzdG9wKHNlbGYpOgorICAgICAgICBpZiBzZWxmLl9zZXJ2ZXJfcHJvY2VzczoKKyAg ICAgICAgICAgIHNlbGYuX3NlcnZlcl9wcm9jZXNzLnN0b3Aoc2VsZi5fcG9ydC5kcml2ZXJfc3Rv cF90aW1lb3V0KCkpCisgICAgICAgICAgICBzZWxmLl9zZXJ2ZXJfcHJvY2VzcyA9IE5vbmUKKyAg ICAgICAgICAgIGlmIHNlbGYuX3Byb2ZpbGVyOgorICAgICAgICAgICAgICAgIHNlbGYuX3Byb2Zp bGVyLnByb2ZpbGVfYWZ0ZXJfZXhpdCgpCisgICAgICAgIHNlbGYuX2RlbGV0ZV90ZW1wb3JhbF9k aXJlY3RvcmllcygpCisKICAgICBkZWYgY21kX2xpbmUoc2VsZiwgcGl4ZWxfdGVzdHMsIHBlcl90 ZXN0X2FyZ3MpOgogICAgICAgICBjbWQgPSBzZWxmLl9jb21tYW5kX3dyYXBwZXIoKQogICAgICAg ICBjbWQuYXBwZW5kKHNlbGYuX3BvcnQuX3BhdGhfdG9fZHJpdmVyKCkpCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy93cHRfcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS93M2Mvd3B0X3J1bm5lci5weQppbmRleCA1MzdhN2VlY2RiYTVhN2EzZDExZDg1YzFl ZTk2Y2Y0MjVkMThkNzk3Li40OTA5OTU5ZTBlZWNhZjk4Y2RiNWFiMzA1Y2Y4MjE1MDkwZGZmOTgy IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy93cHRfcnVubmVyLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3dwdF9ydW5uZXIucHkKQEAgLTgwLDcgKzgw LDYgQEAgZGVmIG1haW4oc2NyaXB0X25hbWUsIGFyZ3YpOgogICAgICMgQ3JlYXRlIHRoZSBQb3J0 LXNwZWNpZmljIGRyaXZlci4KICAgICBwb3J0Ll9kaXNwbGF5X3NlcnZlciA9IG9wdGlvbnMuZGlz cGxheV9zZXJ2ZXIKICAgICBkaXNwbGF5X2RyaXZlciA9IHBvcnQuY3JlYXRlX2RyaXZlcih3b3Jr ZXJfbnVtYmVyPTAsIG5vX3RpbWVvdXQ9VHJ1ZSkuX21ha2VfZHJpdmVyKHBpeGVsX3Rlc3RzPUZh bHNlKQotICAgIGRpc3BsYXlfZHJpdmVyLnN0YXJ0KEZhbHNlLCBbXSkKICAgICBpZiBub3QgZGlz cGxheV9kcml2ZXIuY2hlY2tfZHJpdmVyKHBvcnQpOgogICAgICAgICByYWlzZSBSdW50aW1lRXJy b3IoIkZhaWxlZCB0byBjaGVjayBkcml2ZXIgJXMiICUgZGlzcGxheV9kcml2ZXIuX19jbGFzc19f Ll9fbmFtZV9fKQogICAgIG9zLmVudmlyb24udXBkYXRlKGRpc3BsYXlfZHJpdmVyLl9zZXR1cF9l bnZpcm9uX2Zvcl90ZXN0KCkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3dl YmRyaXZlcl90ZXN0cy93ZWJkcml2ZXJfdGVzdF9ydW5uZXIucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3dlYmRyaXZlcl90ZXN0cy93ZWJkcml2ZXJfdGVzdF9ydW5uZXIucHkKaW5kZXggZGJl N2ZlZGMyMDlmMTc1NTM4NDc5NjZmZmIxYjMyYzUzMzhmYThkYS4uZjllNjEzM2Y1MWM2MzVlODMy MzNiYzZhNTA3OTZlMDE0YmZkNjRkNCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS93ZWJkcml2ZXJfdGVzdHMvd2ViZHJpdmVyX3Rlc3RfcnVubmVyLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvd2ViZHJpdmVyX3Rlc3RzL3dlYmRyaXZlcl90ZXN0X3J1bm5lci5weQpA QCAtNjAsNyArNjAsNiBAQCBjbGFzcyBXZWJEcml2ZXJUZXN0UnVubmVyKG9iamVjdCk6CiAgICAg ICAgICAgICBpZiBub3Qgb3MucGF0aC5pc2ZpbGUob3MucGF0aC5qb2luKHNlbGYuX3Rlc3RzX2Rp ciwgdGVzdCkpOgogICAgICAgICAgICAgICAgIF9sb2cud2FybmluZygnVGVzdCAlcyBkb2VzIG5v dCBleGlzdCcgJSB0ZXN0KQogCi0gICAgICAgIHNlbGYuX2Rpc3BsYXlfZHJpdmVyLnN0YXJ0KEZh bHNlLCBbXSkKICAgICAgICAgZW52ID0gc2VsZi5fZGlzcGxheV9kcml2ZXIuX3NldHVwX2Vudmly b25fZm9yX3Rlc3QoKQogICAgICAgICBzZWxmLl9ydW5uZXJzID0gW3J1bm5lcl9jbHMoc2VsZi5f cG9ydCwgZHJpdmVyLCBlbnYsIHNlbGYuX2V4cGVjdGF0aW9ucykgZm9yIHJ1bm5lcl9jbHMgaW4g c2VsZi5SVU5ORVJfQ0xBU1NFU10KIApkaWZmIC0tZ2l0IGEvVG9vbHMvZ2xpYi9hcGlfdGVzdF9y dW5uZXIucHkgYi9Ub29scy9nbGliL2FwaV90ZXN0X3J1bm5lci5weQppbmRleCAwYTcyZDJhNmRm ZmZlMGMxMTM1MjkzM2I1Nzc4YzUwODA4ZTY3MGRlLi41ZjgwOWQ0NTE4MThhMjJkYTIzMTBlOTQy MDc4OGQ2MGMwYTk4OWIyIDEwMDc1NQotLS0gYS9Ub29scy9nbGliL2FwaV90ZXN0X3J1bm5lci5w eQorKysgYi9Ub29scy9nbGliL2FwaV90ZXN0X3J1bm5lci5weQpAQCAtMTA1LDcgKzEwNSw2IEBA IGNsYXNzIFRlc3RSdW5uZXIob2JqZWN0KToKICAgICAgICAgcmV0dXJuIGRyaXZlcgogCiAgICAg ZGVmIF9zZXR1cF90ZXN0aW5nX2Vudmlyb25tZW50KHNlbGYpOgotICAgICAgICBzZWxmLl9kcml2 ZXIuc3RhcnQoRmFsc2UsIFtdKQogICAgICAgICBzZWxmLl90ZXN0X2VudiA9IHNlbGYuX2RyaXZl ci5fc2V0dXBfZW52aXJvbl9mb3JfdGVzdCgpCiAgICAgICAgIHNlbGYuX3Rlc3RfZW52WyJURVNU X1dFQktJVF9BUElfV0VCS0lUMl9SRVNPVVJDRVNfUEFUSCJdID0gY29tbW9uLnRvcF9sZXZlbF9w YXRoKCJUb29scyIsICJUZXN0V2ViS2l0QVBJIiwgIlRlc3RzIiwgIldlYktpdCIpCiAgICAgICAg IHNlbGYuX3Rlc3RfZW52WyJURVNUX1dFQktJVF9BUElfV0VCS0lUMl9JTkpFQ1RFRF9CVU5ETEVf UEFUSCJdID0gY29tbW9uLmxpYnJhcnlfYnVpbGRfcGF0aCgpCg== 374597 2019-07-22 07:10:45 -0700 2019-07-22 07:19:34 -0700 Patch bug-199945-20190722161043.patch text/plain 2326 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3NjgxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODQ2OWFjMWI5NzFmNmEyMDIyZmM0YjFjMDBiNmQ5MzBk NDc0ZDA2ZS4uOTMxMWMxZWU3YWQ5NGI0ODk2YjViYWQ3ODJkMGJlYzNlN2NlZDg1MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE5LTA3LTIyICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFt3ZWJraXRweV0gQWRkIGFuIHVuaXQgdGVzdCBmb3Igc2V0dGlu ZyB1cCB0aGUgZHJpdmVyIGVudmlyb25tZW50IHdpdGhvdXQgc3RhcnRpbmcgaXQuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTk5NDUKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGFkZHMgYW4gdW5p dCB0ZXN0IGZvciB0aGUgY2hhbmdlIGltcGxlbWVudGVkIGluIHIyNDc2NjMuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyX3VuaXR0ZXN0LnB5OgorICAgICAgICAoRHJp dmVyVGVzdC50ZXN0X3NldHVwX2Vudmlyb25fYmFzZV92YXJzKToKKyAgICAgICAgKERyaXZlclRl c3QpOgorICAgICAgICAoRHJpdmVyVGVzdC50ZXN0X3NldHVwX2Vudmlyb25fd2l0aG91dF9zdGFy dGluZ19kcml2ZXIpOgorCiAyMDE5LTA3LTIxICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhA YXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIFtXZWJLaXQyXSBBZGQgbGltaXRlZCBzdXBwb3J0 IGZvciAtaXNQb3NpdGlvbjphdEJvdW5kYXJ5OmluRGlyZWN0aW9uOiBpbiBXS0NvbnRlbnRWaWV3 CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyX3VuaXR0ZXN0 LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlcl91bml0dGVzdC5weQppbmRl eCBhM2Y5NjU3NzM2MTVkZWEyN2NjODk5MWYwMTE1YTVkMGE1ZGY3MzQwLi4xNzc2YTA2YjU4MjZh OWNiMjlhNjQ0MjJhYjQ5NzEyZjg2NmMzMzYwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3BvcnQvZHJpdmVyX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvcG9ydC9kcml2ZXJfdW5pdHRlc3QucHkKQEAgLTM3OSw2ICszNzksMjAgQEAgY2xhc3MgRHJp dmVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICAgICAgICAgIHNlbGYuYXNz ZXJ0SW4odmFyLCBlbnZpcm9ubWVudF9kcml2ZXJfdGVzdCkKICAgICAgICAgICAgICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChlbnZpcm9ubWVudF9kcml2ZXJfdGVzdFt2YXJdLCBlbnZpcm9uX2tl ZXBfeWVzW3Zhcl0pCiAKKyAgICBkZWYgdGVzdF9zZXR1cF9lbnZpcm9uX3dpdGhvdXRfc3RhcnRp bmdfZHJpdmVyKHNlbGYpOgorICAgICAgICBlbnZpcm9uX3VzZXIgPSB7J1dFQktJVF9PVVRQVVRE SVInOiAnL29wdC93ZWJraXQvV2ViS2l0QnVpbGQvUmVsZWFzZSd9CisgICAgICAgIHdpdGggcGF0 Y2goJ29zLmVudmlyb24nLCBlbnZpcm9uX3VzZXIpOgorICAgICAgICAgICAgcG9ydCA9IHNlbGYu bWFrZV9wb3J0KCkKKyAgICAgICAgICAgIGRyaXZlciA9IERyaXZlcihwb3J0LCBOb25lLCBwaXhl bF90ZXN0cz1GYWxzZSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZHJpdmVyLl9kcml2 ZXJfdGVtcGRpciwgTm9uZSkKKyAgICAgICAgICAgIGVudmlyb25fZHJpdmVyID0gZHJpdmVyLl9z ZXR1cF9lbnZpcm9uX2Zvcl90ZXN0KCkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0Tm90RXF1YWwo ZHJpdmVyLl9kcml2ZXJfdGVtcGRpciwgTm9uZSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1 ZShwb3J0Ll9maWxlc3lzdGVtLmlzZGlyKHN0cihkcml2ZXIuX2RyaXZlcl90ZW1wZGlyKSkpCisg ICAgICAgICAgICBmb3IgdmFyIGluIGVudmlyb25fZHJpdmVyOgorICAgICAgICAgICAgICAgIHNl bGYuYXNzZXJ0Tm90RXF1YWwodmFyLCBOb25lKQorICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0 Tm90RXF1YWwoZW52aXJvbl9kcml2ZXJbdmFyXSwgTm9uZSkKKworCiAgICAgZGVmIHRlc3RfY3Jl YXRlX3RlbXBvcmFsX2hvbWVfZGlyKHNlbGYpOgogICAgICAgICBlbnZpcm9uX3VzZXIgPSB7J0hP TUUnOiAnL2hvbWUvaWdhbGlhJ30KICAgICAgICAgd2l0aCBwYXRjaCgnb3MuZW52aXJvbicsIGVu dmlyb25fdXNlciksIHBhdGNoKCdzeXMucGxhdGZvcm0nLCAnbGludXgyJyk6Cg==