62945 2011-06-18 16:58:59 -0700 REGRESSION: GitTestWithMock.test_create_patch fails 2011-07-13 18:03:11 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Regression P2 Normal --- 1 dbates eric abarth eric webkit.review.bot oldest_to_newest 423279 0 dbates 2011-06-18 16:58:59 -0700 When I ran test-webkitpy --all today, webkitpy.common.checkout.scm.scm_unittest.GitTestWithMock.test_create_patch failed with: Traceback (most recent call last): File "/Users/dbates/Desktop/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py", line 1454, in setUp self.scm = Git(None, executive=executive) File "/Users/dbates/Desktop/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git.py", line 55, in __init__ SCM.__init__(self, cwd, executive) File "/Users/dbates/Desktop/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/scm.py", line 66, in __init__ self.checkout_root = self.find_checkout_root(self.cwd) File "/Users/dbates/Desktop/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git.py", line 96, in find_checkout_root (checkout_root, dot_git) = os.path.split(run_command(['git', 'rev-parse', '--git-dir'], cwd=(path or "./"))) File "/Users/dbates/Desktop/WebKit/Tools/Scripts/webkitpy/common/system/executive.py", line 102, in run_command return Executive().run_command(*args, **kwargs) File "/Users/dbates/Desktop/WebKit/Tools/Scripts/webkitpy/common/system/executive.py", line 403, in run_command (error_handler or self.default_error_handler)(script_error) File "/Users/dbates/Desktop/WebKit/Tools/Scripts/webkitpy/common/system/executive.py", line 322, in default_error_handler raise error ScriptError: Failed to run "[u'git', u'rev-parse', u'--git-dir']" exit_code: 128 cwd: ./ 423281 1 dbates 2011-06-18 17:21:26 -0700 From briefly looking into this it, find_checkout_root() doesn't use the Executive object passed into SCM.__init__(). Instead, it calls the global run_command() (defined in Executive.py) which instantiates its own Executive. So the mock executive object we pass to the Git constructor in GitTestWithMock.setUp() isn't being used. Hence, find_checkout_root() actually tries to run the git command, which fails since the current working directory isn't a git repository. 436802 2 100742 eric 2011-07-13 17:56:49 -0700 Created attachment 100742 Patch 436805 3 100742 dbates 2011-07-13 17:59:19 -0700 Comment on attachment 100742 Patch Yay! 436810 4 eric 2011-07-13 18:03:11 -0700 Committed r90967: <http://trac.webkit.org/changeset/90967> 100742 2011-07-13 17:56:49 -0700 2011-07-13 17:59:18 -0700 Patch bug-62945-20110713175648.patch text/plain 7978 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTA5NjYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxODM5Y2RhODNjN2RiMjI4OTQ3OGVkYTExYzYyNGFlZTQy YTU5NTAzLi42NjYyMzE2YzRhYzM0NWQ1MjI5YWNjODdkODMwZDAxMmFlNTU2NWQ0IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTEtMDctMTMgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IFJFR1JFU1NJT046IEdpdFRlc3RXaXRoTW9jay50ZXN0X2NyZWF0ZV9wYXRjaCBmYWlscworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjI5NDUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJIHdhcyBub3QgYWJs ZSB0byByZXByb2R1Y2UgdGhlIGV4YWN0IGZhaWx1cmUgc2VlbiBpbiB0aGUgYnVnLAorICAgICAg ICBob3dldmVyIHRoaXMgdGVzdCB3YXMgZmFpbGluZyBvbiBteSBtYWNoaW5lIGZvciBvdGhlciBy ZWFzb25zLgorCisgICAgICAgIEkgd2VudCB0aHJvdWdoIGFuZCBkaWQgYW4gYXVkaXQgb2Ygb3Vy IHJ1bl9jb21tYW5kIHVzYWdlLCBpdCdzCisgICAgICAgIGVudGlyZWx5IGluIHNjbSBjbGFzc2Vz IGFmdGVyIHRoaXMgY2hhbmdlLiAgKE5vdCBzdXJwcmlzaW5nIGdpdmVuCisgICAgICAgIHRoYXQg c2NtLnB5IHdhcyB0aGUgc2Vjb25kIGZpbGUgZXZlciBjcmVhdGVkIGluIHdlYmtpdC5weS4pCisK KyAgICAgICAgVGhlIHJlYWwgYnVnIEknbSBmaXhpbmcgaGVyZSBpcyB0aGF0IHdlIHdlcmUgc2V0 dGluZyBleGVjdXRpdmUuc2hvdWxkX2xvZworICAgICAgICB3aGVuIHRoZSB2YWx1ZSBoYWQgY2hh bmdlZCB0byBleGVjdXRpdmUuX3Nob3VsZF9sb2cuICBOb3cgd2Ugc2V0IHRoZSByaWdodCBvbmUK KyAgICAgICAgYW5kIHRoZSB0ZXN0IHdvcmtzIGFnYWluLgorCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hlY2tvdXQucHk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHk6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weToKKwogMjAxMS0wNy0xMyAg SWx5YSBTaGVybWFuICA8aXNoZXJtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEZpeCBXVEYg aGVhZGVyIGd1YXJkIHN0eWxlIGNoZWNrCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jaGVja291dC9jaGVja291dC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL2NoZWNrb3V0L2NoZWNrb3V0LnB5CmluZGV4IDA0M2VkZDE1M2ZhNzE0NWYyZTFmNWQw ZjM0MDAzZjE1N2MxNzlhMmQuLmNiODg1MTMwNzkxMzZiMjY4ZTIzY2Y5NTBmZGViMDQyNWRhNjZk ODcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2No ZWNrb3V0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2No ZWNrb3V0LnB5CkBAIC0xNTIsNyArMTUyLDcgQEAgY2xhc3MgQ2hlY2tvdXQob2JqZWN0KToKICAg ICAgICAgICAgIGFyZ3MgKz0gWyctLXJldmlld2VyJywgcGF0Y2gucmV2aWV3ZXIoKS5mdWxsX25h bWVdCiAgICAgICAgIGlmIGZvcmNlOgogICAgICAgICAgICAgYXJncy5hcHBlbmQoJy0tZm9yY2Un KQotICAgICAgICBydW5fY29tbWFuZChhcmdzLCBpbnB1dD1wYXRjaC5jb250ZW50cygpKQorICAg ICAgICBzZWxmLl9zY20uX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChhcmdzLCBpbnB1dD1wYXRjaC5j b250ZW50cygpKQogCiAgICAgZGVmIGFwcGx5X3JldmVyc2VfZGlmZihzZWxmLCByZXZpc2lvbik6 CiAgICAgICAgIHNlbGYuX3NjbS5hcHBseV9yZXZlcnNlX2RpZmYocmV2aXNpb24pCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQppbmRleCBm ZDliMTJlZmUyYTlhNTJlMWViMTEzMTI3MjJiZDRhYmQzYzA5NmFkLi41NmEzMjFhMzc1ZjEwZjkz NDA1YTQzOWY1MWQ3ZTZmYTJiZGQ5ZDMwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKQEAgLTg4LDYgKzg4LDcgQEAgY2xhc3MgR2l0 KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgaW5fd29y a2luZ19kaXJlY3RvcnkoY2xzLCBwYXRoKToKKyAgICAgICAgIyBGSVhNRTogVGhpcyBzaG91bGQg dXNlIGFuIEV4ZWN1dGl2ZS4KICAgICAgICAgcmV0dXJuIHJ1bl9jb21tYW5kKFsnZ2l0JywgJ3Jl di1wYXJzZScsICctLWlzLWluc2lkZS13b3JrLXRyZWUnXSwgY3dkPXBhdGgsIGVycm9yX2hhbmRs ZXI9RXhlY3V0aXZlLmlnbm9yZV9lcnJvcikucnN0cmlwKCkgPT0gInRydWUiCiAKICAgICBAY2xh c3NtZXRob2QKQEAgLTEwOSw2ICsxMTAsNyBAQCBjbGFzcyBHaXQoU0NNLCBTVk5SZXBvc2l0b3J5 KToKICAgICAgICAgIyBGSVhNRTogVGhpcyBzaG91bGQgcHJvYmFibHkgdXNlIGN3ZD1zZWxmLmNo ZWNrb3V0X3Jvb3QuCiAgICAgICAgICMgUGFzcyAtLWdldC1hbGwgZm9yIGNhc2VzIHdoZXJlIHRo ZSBjb25maWcgaGFzIG11bHRpcGxlIHZhbHVlcwogICAgICAgICAjIFBhc3MgdGhlIGN3ZCBpZiBw cm92aWRlZCBzbyB0aGF0IHdlIGNhbiBoYW5kbGUgdGhlIGNhc2Ugb2YgcnVubmluZyB3ZWJraXQt cGF0Y2ggb3V0c2lkZSBvZiB0aGUgd29ya2luZyBkaXJlY3RvcnkuCisgICAgICAgICMgRklYTUU6 IFRoaXMgc2hvdWxkIHVzZSBhbiBFeGVjdXRpdmUuCiAgICAgICAgIHJldHVybiBydW5fY29tbWFu ZChbImdpdCIsICJjb25maWciLCAiLS1nZXQtYWxsIiwga2V5XSwgZXJyb3JfaGFuZGxlcj1FeGVj dXRpdmUuaWdub3JlX2Vycm9yLCBjd2Q9Y3dkKS5yc3RyaXAoJ1xuJykKIAogICAgIEBzdGF0aWNt ZXRob2QKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0 L3NjbS9zY20ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20v c2NtLnB5CmluZGV4IGM0YThhNGQ1ZGNhZWZhYmQxYzEwNWVmZDEyYmE3NzAxYTFiODQ2OTQuLmM0 ZDlhZGI0ZDBmZTFiYzIxZTQ3MjdhYzIwZWIyYWVhZThkZWJiNmIgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weQpAQCAtMzYsNyArMzYs NyBAQCBpbXBvcnQgc3lzCiBpbXBvcnQgc2h1dGlsCiAKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5 c3RlbS5kZXByZWNhdGVkX2xvZ2dpbmcgaW1wb3J0IGVycm9yLCBsb2cKLWZyb20gd2Via2l0cHku Y29tbW9uLnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IEV4ZWN1dGl2ZSwgcnVuX2NvbW1hbmQsIFNj cmlwdEVycm9yCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBF eGVjdXRpdmUsIFNjcmlwdEVycm9yCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0gaW1wb3J0 IG9zcGF0aAogCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5CmluZGV4IDMyZDIwNjM3ZDkwZDliNGEzMWNj MTBhY2JkNmQzZGMxOGNjMjcxOWQuLjFiNzE1NjZjMDcxZmZjZDAzZGU4ZTQ1Y2ZhMDU1OGQ3ZGMz Yzg5ZjcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0 L3NjbS9zY21fdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weQpAQCAtMTA3LDYgKzEwNyw3IEBAIGRlZiByZWFk X2Zyb21fcGF0aChmaWxlX3BhdGgsIGVuY29kaW5nPSJ1dGYtOCIpOgogZGVmIF9tYWtlX2RpZmYo Y29tbWFuZCwgKmFyZ3MpOgogICAgICMgV2UgdXNlIHRoaXMgd3JhcHBlciB0byBkaXNhYmxlIG91 dHB1dCBkZWNvZGluZy4gZGlmZnMgc2hvdWxkIGJlIHRyZWF0ZWQgYXMKICAgICAjIGJpbmFyeSBm aWxlcyBzaW5jZSB0aGV5IG1heSBpbmNsdWRlIHRleHQgZmlsZXMgb2YgbXVsdGlwbGUgZGlmZmVy bmV0IGVuY29kaW5ncy4KKyAgICAjIEZJWE1FOiBUaGlzIHNob3VsZCB1c2UgYW4gRXhlY3V0aXZl LgogICAgIHJldHVybiBydW5fY29tbWFuZChbY29tbWFuZCwgImRpZmYiXSArIGxpc3QoYXJncyks IGRlY29kZV9vdXRwdXQ9RmFsc2UpCiAKIApAQCAtMTQ4NCwyNyArMTQ4NSwyOCBAQCBjbGFzcyBH aXRTVk5UZXN0KFNDTVRlc3QpOgogIyBXZSBuZWVkIHRvIHNwbGl0IG9mZiBtb3JlIG9mIHRoZXNl IFNDTSB0ZXN0cyB0byB1c2UgbW9ja3MgaW5zdGVhZCBvZiB0aGUgZmlsZXN5c3RlbS4KICMgVGhp cyBjbGFzcyBpcyB0aGUgZmlyc3QgcGFydCBvZiB0aGF0LgogY2xhc3MgR2l0VGVzdFdpdGhNb2Nr KHVuaXR0ZXN0LlRlc3RDYXNlKToKLSAgICBkZWYgc2V0VXAoc2VsZik6Ci0gICAgICAgIGV4ZWN1 dGl2ZSA9IE1vY2tFeGVjdXRpdmUoc2hvdWxkX2xvZz1GYWxzZSkKKyAgICBkZWYgbWFrZV9zY20o c2VsZiwgbG9nZ2luZ19leGVjdXRpdmU9RmFsc2UpOgogICAgICAgICAjIFdlIGRvIHRoaXMgc2hv dWxkX2xvZyBkYW5jZSB0byBhdm9pZCBsb2dnaW5nIHdoZW4gR2l0Ll9faW5pdF9fIHJ1bnMgc3lz Y3RsIG9uIG1hYyB0byBjaGVjayBmb3IgNjQtYml0IHN1cHBvcnQuCi0gICAgICAgIHNlbGYuc2Nt ID0gR2l0KE5vbmUsIGV4ZWN1dGl2ZT1leGVjdXRpdmUpCi0gICAgICAgIGV4ZWN1dGl2ZS5zaG91 bGRfbG9nID0gVHJ1ZQorICAgICAgICBzY20gPSBHaXQoY3dkPU5vbmUsIGV4ZWN1dGl2ZT1Nb2Nr RXhlY3V0aXZlKCkpCisgICAgICAgIHNjbS5fZXhlY3V0aXZlLl9zaG91bGRfbG9nID0gbG9nZ2lu Z19leGVjdXRpdmUKKyAgICAgICAgcmV0dXJuIHNjbQogCiAgICAgZGVmIHRlc3RfY3JlYXRlX3Bh dGNoKHNlbGYpOgorICAgICAgICBzY20gPSBzZWxmLm1ha2Vfc2NtKGxvZ2dpbmdfZXhlY3V0aXZl PVRydWUpCiAgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJNT0NLIHJ1bl9jb21tYW5kOiBbJ2dp dCcsICdtZXJnZS1iYXNlJywgdSdyZWZzL3JlbW90ZXMvb3JpZ2luL21hc3RlcicsICdIRUFEJ11c bk1PQ0sgcnVuX2NvbW1hbmQ6IFsnZ2l0JywgJ2RpZmYnLCAnLS1iaW5hcnknLCAnLS1uby1leHQt ZGlmZicsICctLWZ1bGwtaW5kZXgnLCAnLU0nLCAnTU9DSyBvdXRwdXQgb2YgY2hpbGQgcHJvY2Vz cycsICctLSddXG5NT0NLIHJ1bl9jb21tYW5kOiBbJ2dpdCcsICdsb2cnLCAnLTI1J11cbiIKLSAg ICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHNlbGYuc2NtLmNyZWF0 ZV9wYXRjaCwga3dhcmdzPXsnY2hhbmdlZF9maWxlcyc6IE5vbmV9LCBleHBlY3RlZF9zdGRlcnI9 ZXhwZWN0ZWRfc3RkZXJyKQorICAgICAgICBPdXRwdXRDYXB0dXJlKCkuYXNzZXJ0X291dHB1dHMo c2VsZiwgc2NtLmNyZWF0ZV9wYXRjaCwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVycikK IAogICAgIGRlZiB0ZXN0X3B1c2hfbG9jYWxfY29tbWl0c190b19zZXJ2ZXJfd2l0aF91c2VybmFt ZV9hbmRfcGFzc3dvcmQoc2VsZik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHNlbGYuc2Nt LnB1c2hfbG9jYWxfY29tbWl0c190b19zZXJ2ZXIodXNlcm5hbWU9J2RiYXRlc0B3ZWJraXQub3Jn JywgcGFzc3dvcmQ9J2JsYWgnKSwgIk1PQ0sgb3V0cHV0IG9mIGNoaWxkIHByb2Nlc3MiKQorICAg ICAgICBzZWxmLmFzc2VydEVxdWFscyhzZWxmLm1ha2Vfc2NtKCkucHVzaF9sb2NhbF9jb21taXRz X3RvX3NlcnZlcih1c2VybmFtZT0nZGJhdGVzQHdlYmtpdC5vcmcnLCBwYXNzd29yZD0nYmxhaCcp LCAiTU9DSyBvdXRwdXQgb2YgY2hpbGQgcHJvY2VzcyIpCiAKICAgICBkZWYgdGVzdF9wdXNoX2xv Y2FsX2NvbW1pdHNfdG9fc2VydmVyX3dpdGhvdXRfdXNlcm5hbWVfYW5kX3Bhc3N3b3JkKHNlbGYp OgotICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhBdXRoZW50aWNhdGlvbkVycm9yLCBzZWxmLnNj bS5wdXNoX2xvY2FsX2NvbW1pdHNfdG9fc2VydmVyKQorICAgICAgICBzZWxmLmFzc2VydFJhaXNl cyhBdXRoZW50aWNhdGlvbkVycm9yLCBzZWxmLm1ha2Vfc2NtKCkucHVzaF9sb2NhbF9jb21taXRz X3RvX3NlcnZlcikKIAogICAgIGRlZiB0ZXN0X3B1c2hfbG9jYWxfY29tbWl0c190b19zZXJ2ZXJf d2l0aF91c2VybmFtZV9hbmRfd2l0aG91dF9wYXNzd29yZChzZWxmKToKLSAgICAgICAgc2VsZi5h c3NlcnRSYWlzZXMoQXV0aGVudGljYXRpb25FcnJvciwgc2VsZi5zY20ucHVzaF9sb2NhbF9jb21t aXRzX3RvX3NlcnZlciwgeyd1c2VybmFtZSc6ICdkYmF0ZXNAd2Via2l0Lm9yZyd9KQorICAgICAg ICBzZWxmLmFzc2VydFJhaXNlcyhBdXRoZW50aWNhdGlvbkVycm9yLCBzZWxmLm1ha2Vfc2NtKCku cHVzaF9sb2NhbF9jb21taXRzX3RvX3NlcnZlciwgeyd1c2VybmFtZSc6ICdkYmF0ZXNAd2Via2l0 Lm9yZyd9KQogCiAgICAgZGVmIHRlc3RfcHVzaF9sb2NhbF9jb21taXRzX3RvX3NlcnZlcl93aXRo b3V0X3VzZXJuYW1lX2FuZF93aXRoX3Bhc3N3b3JkKHNlbGYpOgotICAgICAgICBzZWxmLmFzc2Vy dFJhaXNlcyhBdXRoZW50aWNhdGlvbkVycm9yLCBzZWxmLnNjbS5wdXNoX2xvY2FsX2NvbW1pdHNf dG9fc2VydmVyLCB7J3Bhc3N3b3JkJzogJ2JsYWgnfSkKKyAgICAgICAgc2VsZi5hc3NlcnRSYWlz ZXMoQXV0aGVudGljYXRpb25FcnJvciwgc2VsZi5tYWtlX3NjbSgpLnB1c2hfbG9jYWxfY29tbWl0 c190b19zZXJ2ZXIsIHsncGFzc3dvcmQnOiAnYmxhaCd9KQogCiBpZiBfX25hbWVfXyA9PSAnX19t YWluX18nOgogICAgIHVuaXR0ZXN0Lm1haW4oKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKaW5kZXggNzJjOWIyMGE2ODA3NzFlZGRjODY0 ZDAwZjVlZGI3MjhiMjUyYTkyMS4uN2NkYTI1NjAzODZiZGY2ZmJkNTgwZThhZDIxOTJmMWUxY2E4 MDc1YSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQv c2NtL3N2bi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9z Y20vc3ZuLnB5CkBAIC05Miw2ICs5Miw3IEBAIGNsYXNzIFNWTihTQ00sIFNWTlJlcG9zaXRvcnkp OgogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiB2YWx1ZV9mcm9tX3N2bl9pbmZvKGNscywgcGF0 aCwgZmllbGRfbmFtZSk6CiAgICAgICAgIHN2bl9pbmZvX2FyZ3MgPSBbJ3N2bicsICdpbmZvJywg cGF0aF0KKyAgICAgICAgIyBGSVhNRTogVGhpcyBzaG91bGQgdXNlIGFuIEV4ZWN1dGl2ZS4KICAg ICAgICAgaW5mb19vdXRwdXQgPSBydW5fY29tbWFuZChzdm5faW5mb19hcmdzKS5yc3RyaXAoKQog ICAgICAgICBtYXRjaCA9IHJlLnNlYXJjaCgiXiVzOiAoP1A8dmFsdWU+LispJCIgJSBmaWVsZF9u YW1lLCBpbmZvX291dHB1dCwgcmUuTVVMVElMSU5FKQogICAgICAgICBpZiBub3QgbWF0Y2g6Cg==