180389 2017-12-04 17:50:03 -0800 [build.webkit.org] Simplify imports in mastercfg_unittest.py 2019-03-11 09:24:44 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified ASSIGNED https://bugs.webkit.org/show_bug.cgi?id=180390 P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap clopez dbates dean_johnson lforschler ossy oldest_to_newest 1378031 0 aakash_jain 2017-12-04 17:50:03 -0800 mastercfg_unittest.py has a BuildBotConfigLoader class which is used to import master.cfg. We should use python imports directly. All the code in this class is no longer required. e.g.: _add_webkitpy_to_sys_path method is unnecessary as Buildbot doesn't depend on webkitpy at all. We should remove this class. 1378032 1 328419 aakash_jain 2017-12-04 17:57:34 -0800 Created attachment 328419 Proposed patch 1378194 2 328419 ossy 2017-12-05 09:39:35 -0800 Comment on attachment 328419 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=328419&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:-32 > - def _add_dependant_modules_to_sys_modules(self): > - from webkitpy.thirdparty.autoinstalled import buildbot > - sys.modules['buildbot'] = buildbot This code was to be able to run mastercfg_unittest.py without installing buildbot and its dependencies. webkitpy autoinstaller installs exactly the same buildbot and twisted version as the build.webkit.org uses. 1378436 3 aakash_jain 2017-12-05 16:05:08 -0800 Good point. I think I need to look into webkitpy more and understand why does webkitpy has buildbot code. Maybe we can move that autoinstaller code here. 1415361 4 328419 clopez 2018-04-17 17:05:46 -0700 Comment on attachment 328419 Proposed patch I'm setting r- because this patch not longer applies on trunk. Also it looks a similar thing has been done on bug 180390. Should we just close this? 328419 2017-12-04 17:57:34 -0800 2018-04-17 17:05:46 -0700 Proposed patch 0001-build.webkit.org-Simplify-imports-in-mastercfg_unitt.patch text/plain 5853 aakash_jain RnJvbSA2NGE2YjgzZWVkNmQ2NGQ3ODBjY2FkMDg1ZDg3MmRiNWY3ZDA5NTU0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBYWthc2ggSmFpbiA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgpE YXRlOiBNb24sIDQgRGVjIDIwMTcgMTc6NTY6MDIgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbYnVp bGQud2Via2l0Lm9yZ10gU2ltcGxpZnkgaW1wb3J0cyBpbiBtYXN0ZXJjZmdfdW5pdHRlc3QucHkK IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODAzODkKClJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgoKKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9tYXN0ZXIuY2ZnOgoqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmct Y29uZmlnL21hc3RlcmNmZ191bml0dGVzdC5weTogSW52b2tlZCBsb2FkQnVpbGRlckNvbmZpZyBk aXJlY3RseS4KKEJ1aWxkQm90Q29uZmlnTG9hZGVyKTogRGVsZXRlZC4KKEJ1aWxkQm90Q29uZmln TG9hZGVyLl9hZGRfd2Via2l0cHlfdG9fc3lzX3BhdGgpOiBEZWxldGVkLCBCdWlsZGJvdCBpcyBu b3QgZGVwZW5kZW50IG9uIHdlYmtpdHB5LgooQnVpbGRCb3RDb25maWdMb2FkZXIuX21vY2tfb3Bl bik6IERlbGV0ZWQuCihCdWlsZEJvdENvbmZpZ0xvYWRlci5fYWRkX2RlcGVuZGFudF9tb2R1bGVz X3RvX3N5c19tb2R1bGVzKTogRGVsZXRlZCwgbm90IHJlcXVpcmVkLgooQnVpbGRCb3RDb25maWdM b2FkZXIubG9hZF9jb25maWcpOiBEZWxldGVkLCB3ZSBjYW4gZGlyZWN0bHkgaW52b2tlIGxvYWRC dWlsZGVyQ29uZmlnLgotLS0KIC4uLi9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2Zn ICAgICAgICAgICAgIHwgIDIgKy0KIC4uLi9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXJj ZmdfdW5pdHRlc3QucHkgIHwgNDIgKysrLS0tLS0tLS0tLS0tLS0tLS0tLQogVG9vbHMvQ2hhbmdl TG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAxNSArKysrKysrKwogMyBm aWxlcyBjaGFuZ2VkLCAyMSBpbnNlcnRpb25zKCspLCAzOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0 ZXIuY2ZnIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv bWFzdGVyLmNmZwppbmRleCAxODljYzI3ZDM3Ni4uNWMzNDRkOTEyNjYgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcK KysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFz dGVyLmNmZwpAQCAtNiw3ICs2LDcgQEAgZnJvbSBidWlsZGJvdC5zdGF0dXMgaW1wb3J0IGh0bWwK IGZyb20gYnVpbGRib3Quc3RhdHVzLndlYi5hdXRoeiBpbXBvcnQgQXV0aHoKIAogZnJvbSBjb21t aXR0ZXJfYXV0aCBpbXBvcnQgQ29tbWl0dGVyQXV0aAotZnJvbSBsb2FkQ29uZmlnIGltcG9ydCAq Citmcm9tIGxvYWRDb25maWcgaW1wb3J0IGxvYWRCdWlsZGVyQ29uZmlnCiAKIAogYyA9IEJ1aWxk bWFzdGVyQ29uZmlnID0ge30KZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1 aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3RlcmNmZ191bml0dGVzdC5weSBiL1Rvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3RlcmNmZ191bml0dGVzdC5w eQppbmRleCA3ZmI5NjAyYTI3OS4uMjQ5MWY5M2VjMWIgMTAwNzU1Ci0tLSBhL1Rvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3RlcmNmZ191bml0dGVzdC5w eQorKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9t YXN0ZXJjZmdfdW5pdHRlc3QucHkKQEAgLTIsNTAgKzIsMTcgQEAKIAogaW1wb3J0IHN5cwogaW1w b3J0IG9zCi1pbXBvcnQgU3RyaW5nSU8KIGltcG9ydCB1bml0dGVzdAotaW1wb3J0IG1ha2VfcGFz c3dvcmRzX2pzb24KIGltcG9ydCBqc29uCiAKK2Zyb20gbG9hZENvbmZpZyBpbXBvcnQgbG9hZEJ1 aWxkZXJDb25maWcKK2Zyb20gc3RlcHMgaW1wb3J0ICoKKwogIyBTaG93IERlcHJpY2F0aW9uV2Fy bmluZ3MgY29tZSBmcm9tIGJ1aWxkYm90IC0gaXQgaXNuJ3QgZGVmYXVsdCB3aXRoIFB5dGhvbiAy Ljcgb3IgbmV3ZXIuCiAjIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTAxNjEgZm9yIGRldGFpbHMuCiBpbXBvcnQgd2FybmluZ3MKIHdhcm5pbmdzLnNpbXBsZWZp bHRlcignZGVmYXVsdCcpCiAKLWNsYXNzIEJ1aWxkQm90Q29uZmlnTG9hZGVyKG9iamVjdCk6Ci0g ICAgZGVmIF9hZGRfd2Via2l0cHlfdG9fc3lzX3BhdGgoc2VsZik6Ci0gICAgICAgICMgV2hlbiBm aWxlcyBhcmUgcGFzc2VkIHRvIHRoZSBweXRob24gaW50ZXJwcmV0ZXIgb24gdGhlIGNvbW1hbmQg bGluZSAoZS5nLiBweXRob24gdGVzdC5weSkgX19maWxlX18gaXMgYSByZWxhdGl2ZSBwYXRoLgot ICAgICAgICBhYnNvbHV0ZV9maWxlX3BhdGggPSBvcy5wYXRoLmFic3BhdGgoX19maWxlX18pCi0g ICAgICAgIHdlYmtpdF9vcmdfY29uZmlnX2RpciA9IG9zLnBhdGguZGlybmFtZShhYnNvbHV0ZV9m aWxlX3BhdGgpCi0gICAgICAgIGJ1aWxkX3NsYXZlX3N1cHBvcnRfZGlyID0gb3MucGF0aC5kaXJu YW1lKHdlYmtpdF9vcmdfY29uZmlnX2RpcikKLSAgICAgICAgd2Via2l0X3Rvb2xzX2RpciA9IG9z LnBhdGguZGlybmFtZShidWlsZF9zbGF2ZV9zdXBwb3J0X2RpcikKLSAgICAgICAgc2NyaXB0c19k aXIgPSBvcy5wYXRoLmpvaW4od2Via2l0X3Rvb2xzX2RpciwgJ1NjcmlwdHMnKQotICAgICAgICBz eXMucGF0aC5hcHBlbmQoc2NyaXB0c19kaXIpCi0KLSAgICBkZWYgX21vY2tfb3BlbihzZWxmLCBm aWxlbmFtZSk6Ci0gICAgICAgIGlmIGZpbGVuYW1lID09ICdwYXNzd29yZHMuanNvbic6Ci0gICAg ICAgICAgICByZXR1cm4gU3RyaW5nSU8uU3RyaW5nSU8oanNvbi5kdW1wcyhtYWtlX3Bhc3N3b3Jk c19qc29uLmNyZWF0ZV9tb2NrX3NsYXZlX3Bhc3N3b3Jkc19kaWN0KCkpKQotICAgICAgICByZXR1 cm4gX19idWlsdGluc19fLm9wZW4oZmlsZW5hbWUpCi0KLSAgICBkZWYgX2FkZF9kZXBlbmRhbnRf bW9kdWxlc190b19zeXNfbW9kdWxlcyhzZWxmKToKLSAgICAgICAgZnJvbSB3ZWJraXRweS50aGly ZHBhcnR5LmF1dG9pbnN0YWxsZWQgaW1wb3J0IGJ1aWxkYm90Ci0gICAgICAgIHN5cy5tb2R1bGVz WydidWlsZGJvdCddID0gYnVpbGRib3QKLQotICAgIGRlZiBsb2FkX2NvbmZpZyhzZWxmLCBtYXN0 ZXJfY2ZnX3BhdGgpOgotICAgICAgICAjIEJlZm9yZSB3ZSBjYW4gdXNlIHdlYmtpdHB5LnRoaXJk cGFydHksIHdlIG5lZWQgdG8gZml4IG91ciBwYXRoIHRvIGluY2x1ZGUgd2Via2l0cHkuCi0gICAg ICAgICMgRklYTUU6IElmIHdlJ3JlIGV2ZXIgcnVuIGJ5IHRlc3Qtd2Via2l0cHkgd2Ugd29uJ3Qg bmVlZCB0aGlzIHN0ZXAuCi0gICAgICAgIHNlbGYuX2FkZF93ZWJraXRweV90b19zeXNfcGF0aCgp Ci0gICAgICAgICMgbWFzdGVyLmNmZyBleHBlY3RzIHRoZSBidWlsZGJvdCBtb2R1bGUgdG8gYmUg aW4gc3lzLnBhdGguCi0gICAgICAgIHNlbGYuX2FkZF9kZXBlbmRhbnRfbW9kdWxlc190b19zeXNf bW9kdWxlcygpCi0KLSAgICAgICAgIyBtYXN0ZXIuY2ZnIGV4cGVjdHMgYSBwYXNzd29yZHMuanNv biBmaWxlIHdoaWNoIGlzIG5vdCBjaGVja2VkIGluLiAgRmFrZSBpdCBieSBtb2NraW5nIG9wZW4o KS4KLSAgICAgICAgZ2xvYmFscygpWydvcGVuJ10gPSBzZWxmLl9tb2NrX29wZW4KLSAgICAgICAg IyBCZWNhdXNlIHRoZSBtYXN0ZXJfY2ZnX3BhdGggbWF5IGhhdmUgJy4nIGluIGl0cyBuYW1lLCB3 ZSBjYW4ndCBqdXN0IHVzZSBpbXBvcnQsIHdlIGhhdmUgdG8gdXNlIGV4ZWNmaWxlLgotICAgICAg ICAjIFdlIHBhc3MgZ2xvYmFscygpIGFzIGJvdGggdGhlIGdsb2JhbHMgYW5kIGxvY2FscyB0byBt aW1pYyBleGVjdHV0aW5nIGluIHRoZSBnbG9iYWwgc2NvcGUsIHNvCi0gICAgICAgICMgdGhhdCBn bG9iYWxzIGRlZmluZWQgaW4gbWFzdGVyLmNmZyB3aWxsIGJlIGdsb2JhbCB0byB0aGlzIGZpbGUg dG9vLgotICAgICAgICBleGVjZmlsZShtYXN0ZXJfY2ZnX3BhdGgsIGdsb2JhbHMoKSwgZ2xvYmFs cygpKQotICAgICAgICBnbG9iYWxzKClbJ29wZW4nXSA9IF9fYnVpbHRpbnNfXy5vcGVuICAjIFN0 b3AgbW9ja2luZyBvcGVuKCkuCi0KIAogY2xhc3MgTWFzdGVyQ2ZnVGVzdCh1bml0dGVzdC5UZXN0 Q2FzZSk6CiAgICAgZGVmIHRlc3RfbnJ3dF9sZWFrc19wYXJzaW5nKHNlbGYpOgpAQCAtNTU4LDcg KzUyNSw4IEBAIGNsYXNzIFJ1bkJlbmNobWFya1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogIyAn YnVpbGQud2Via2l0Lm9yZy1jb25maWcnIGlzIG5vdCBhIHZhbGlkIG1vZHVsZSBuYW1lIChkdWUg dG8gJy4nIGFuZCAnLScpCiAjIHNvIGZvciBub3cgdGhpcyBpcyBhIHN0YW5kLWFsb25lIHRlc3Qg aGFybmVzcy4KIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6Ci0gICAgQnVpbGRCb3RDb25maWdM b2FkZXIoKS5sb2FkX2NvbmZpZygnbWFzdGVyLmNmZycpCisgICAgYyA9IHt9CisgICAgbG9hZEJ1 aWxkZXJDb25maWcoYykKICAgICBCdWlsZFN0ZXBzQ29uc3RydWN0b3JUZXN0LmdlbmVyYXRlVGVz dHMoKQogICAgIEJ1aWxkU3RlcHNUZXN0LmdlbmVyYXRlVGVzdHMoKQogICAgIHVuaXR0ZXN0Lm1h aW4oKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4 IDNhYzNkZTZiNTM2Li5iYTZkZWVjMjc0NSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisr KyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE3LTEyLTA0ICBBYWthc2gg SmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KKworICAgICAgICBbYnVpbGQud2Via2l0Lm9y Z10gU2ltcGxpZnkgaW1wb3J0cyBpbiBtYXN0ZXJjZmdfdW5pdHRlc3QucHkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MDM4OQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZzoKKyAgICAgICAgKiBCdWlsZFNsYXZl U3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXJjZmdfdW5pdHRlc3QucHk6IElu dm9rZWQgbG9hZEJ1aWxkZXJDb25maWcgZGlyZWN0bHkuCisgICAgICAgIChCdWlsZEJvdENvbmZp Z0xvYWRlcik6IERlbGV0ZWQuCisgICAgICAgIChCdWlsZEJvdENvbmZpZ0xvYWRlci5fYWRkX3dl YmtpdHB5X3RvX3N5c19wYXRoKTogRGVsZXRlZCwgQnVpbGRib3QgaXMgbm90IGRlcGVuZGVudCBv biB3ZWJraXRweS4KKyAgICAgICAgKEJ1aWxkQm90Q29uZmlnTG9hZGVyLl9tb2NrX29wZW4pOiBE ZWxldGVkLgorICAgICAgICAoQnVpbGRCb3RDb25maWdMb2FkZXIuX2FkZF9kZXBlbmRhbnRfbW9k dWxlc190b19zeXNfbW9kdWxlcyk6IERlbGV0ZWQsIG5vdCByZXF1aXJlZC4KKyAgICAgICAgKEJ1 aWxkQm90Q29uZmlnTG9hZGVyLmxvYWRfY29uZmlnKTogRGVsZXRlZCwgd2UgY2FuIGRpcmVjdGx5 IGludm9rZSBsb2FkQnVpbGRlckNvbmZpZy4KKwogMjAxNy0xMi0wNCAgTmFuIFdhbmcgIDxuX3dh bmdAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBBT006IEltcGxlbWVudCByZWxhdGlvbiB0eXBl IHByb3BlcnRpZXMKLS0gCjIuMTEuMCAoQXBwbGUgR2l0LTgwKQoK