80253 2012-03-05 01:26:42 -0800 REGRESSION(r109294): It broke the unittest of master.cfg 2012-03-06 04:25:46 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 ossy webkit-unassigned lforschler mrowe ossy wsiegrist oldest_to_newest 570510 0 ossy 2012-03-05 01:26:42 -0800 /usr/lib/python2.6/dist-packages/twisted/mail/smtp.py:10: DeprecationWarning: the MimeWriter module is deprecated; use the email package instead import MimeWriter, tempfile, rfc822 Traceback (most recent call last): File "./mastercfg_unittest.py", line 321, in <module> BuildBotConfigLoader().load_config('master.cfg') File "./mastercfg_unittest.py", line 48, in load_config execfile(master_cfg_path, globals(), globals()) File "master.cfg", line 870, in <module> loadBuilderConfig(c) File "master.cfg", line 807, in loadBuilderConfig passwords = json.load(open('passwords.json')) File "./mastercfg_unittest.py", line 26, in _mock_open return StringIO.StringIO(simplejson.dumps(self._create_mock_passwords_dict())) NameError: global name 'simplejson' is not defined Patch is coming soon. 570516 1 130079 ossy 2012-03-05 01:32:45 -0800 Created attachment 130079 proposed fix 571720 2 130079 vestbo 2012-03-06 04:24:33 -0800 Comment on attachment 130079 proposed fix lgtm based on http://trac.webkit.org/changeset/109294/trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 571721 3 ossy 2012-03-06 04:25:36 -0800 Landed in http://trac.webkit.org/changeset/109902 130079 2012-03-05 01:32:45 -0800 2012-03-06 04:25:46 -0800 proposed fix 1.patch text/plain 2767 ossy ZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL21hc3RlcmNmZ191bml0dGVzdC5weSBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL21hc3RlcmNmZ191bml0dGVzdC5weQppbmRleCBjMjhhYjJhLi4y MWUwM2NkIDEwMDc1NQotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQu b3JnLWNvbmZpZy9tYXN0ZXJjZmdfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyY2ZnX3VuaXR0ZXN0LnB5CkBAIC0x NywyNyArMTcsMjMgQEAgY2xhc3MgQnVpbGRCb3RDb25maWdMb2FkZXIob2JqZWN0KToKICAgICAg ICAgc3lzLnBhdGguYXBwZW5kKHNjcmlwdHNfZGlyKQogCiAgICAgZGVmIF9jcmVhdGVfbW9ja19w YXNzd29yZHNfZGljdChzZWxmKToKLSAgICAgICAgY29uZmlnX2RpY3QgPSBzaW1wbGVqc29uLmxv YWQob3BlbignY29uZmlnLmpzb24nKSkKKyAgICAgICAgY29uZmlnX2RpY3QgPSBqc29uLmxvYWQo b3BlbignY29uZmlnLmpzb24nKSkKICAgICAgICAgcmV0dXJuIGRpY3QoWyhzbGF2ZVsnbmFtZSdd LCAnMTIzNCcpIGZvciBzbGF2ZSBpbiBjb25maWdfZGljdFsnc2xhdmVzJ11dKQogCiAgICAgZGVm IF9tb2NrX29wZW4oc2VsZiwgZmlsZW5hbWUpOgogICAgICAgICBpZiBmaWxlbmFtZSA9PSAncGFz c3dvcmRzLmpzb24nOgotICAgICAgICAgICAgIyBGSVhNRTogVGhpcyBkZXBlbmRzIG9uIF9hZGRf ZGVwZW5kYW50X21vZHVsZXNfdG9fc3lzX21vZHVsZXMgaW1wb3J0ZWQgc2ltcGxlanNvbi4KLSAg ICAgICAgICAgIHJldHVybiBTdHJpbmdJTy5TdHJpbmdJTyhzaW1wbGVqc29uLmR1bXBzKHNlbGYu X2NyZWF0ZV9tb2NrX3Bhc3N3b3Jkc19kaWN0KCkpKQorICAgICAgICAgICAgcmV0dXJuIFN0cmlu Z0lPLlN0cmluZ0lPKGpzb24uZHVtcHMoc2VsZi5fY3JlYXRlX21vY2tfcGFzc3dvcmRzX2RpY3Qo KSkpCiAgICAgICAgIHJldHVybiBfX2J1aWx0aW5zX18ub3BlbihmaWxlbmFtZSkKIAogICAgIGRl ZiBfYWRkX2RlcGVuZGFudF9tb2R1bGVzX3RvX3N5c19tb2R1bGVzKHNlbGYpOgogICAgICAgICBm cm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZCBpbXBvcnQgYnVpbGRib3QKLSAg ICAgICAgaW1wb3J0IGpzb24gYXMgc2ltcGxlanNvbgotCiAgICAgICAgIHN5cy5tb2R1bGVzWydi dWlsZGJvdCddID0gYnVpbGRib3QKLSAgICAgICAgc3lzLm1vZHVsZXNbJ3NpbXBsZWpzb24nXSA9 IHNpbXBsZWpzb24KIAogICAgIGRlZiBsb2FkX2NvbmZpZyhzZWxmLCBtYXN0ZXJfY2ZnX3BhdGgp OgogICAgICAgICAjIEJlZm9yZSB3ZSBjYW4gdXNlIHdlYmtpdHB5LnRoaXJkcGFydHksIHdlIG5l ZWQgdG8gZml4IG91ciBwYXRoIHRvIGluY2x1ZGUgd2Via2l0cHkuCiAgICAgICAgICMgRklYTUU6 IElmIHdlJ3JlIGV2ZXIgcnVuIGJ5IHRlc3Qtd2Via2l0cHkgd2Ugd29uJ3QgbmVlZCB0aGlzIHN0 ZXAuCiAgICAgICAgIHNlbGYuX2FkZF93ZWJraXRweV90b19zeXNfcGF0aCgpCi0gICAgICAgICMg bWFzdGVyLmNmZyBleHBlY3RzIHRoZSBidWlsZGJvdCBhbmQgc2ltcGxlanNvbiBtb2R1bGVzIHRv IGJlIGluIHN5cy5wYXRoLgorICAgICAgICAjIG1hc3Rlci5jZmcgZXhwZWN0cyB0aGUgYnVpbGRi b3QgbW9kdWxlIHRvIGJlIGluIHN5cy5wYXRoLgogICAgICAgICBzZWxmLl9hZGRfZGVwZW5kYW50 X21vZHVsZXNfdG9fc3lzX21vZHVsZXMoKQogCiAgICAgICAgICMgbWFzdGVyLmNmZyBleHBlY3Rz IGEgcGFzc3dvcmRzLmpzb24gZmlsZSB3aGljaCBpcyBub3QgY2hlY2tlZCBpbi4gIEZha2UgaXQg YnkgbW9ja2luZyBvcGVuKCkuCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9D aGFuZ2VMb2cKaW5kZXggNWNjY2M0Yi4uZmVlZDJlYSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdl TG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDEyLTAzLTA1ICBD c2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKKyAgICAgICAgUkVHUkVTU0lP TihyMTA5Mjk0KTogSXQgYnJva2UgdGhlIHVuaXR0ZXN0IG9mIG1hc3Rlci5jZmcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwMjUzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9y dC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXJjZmdfdW5pdHRlc3QucHk6IFVzZSBqc29u IGluc3RlYWQgb2Ygc2ltcGxlanNvbi4KKyAgICAgICAgKEJ1aWxkQm90Q29uZmlnTG9hZGVyLl9j cmVhdGVfbW9ja19wYXNzd29yZHNfZGljdCk6CisgICAgICAgIChCdWlsZEJvdENvbmZpZ0xvYWRl ci5fbW9ja19vcGVuKToKKyAgICAgICAgKEJ1aWxkQm90Q29uZmlnTG9hZGVyLl9hZGRfZGVwZW5k YW50X21vZHVsZXNfdG9fc3lzX21vZHVsZXMpOgorICAgICAgICAoQnVpbGRCb3RDb25maWdMb2Fk ZXIubG9hZF9jb25maWcpOgorCisyMDEyLTAzLTA1ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5 QHdlYmtpdC5vcmc+CisKICAgICAgICAgUXQgQVBJIHRlc3QgYnVpbGRzdGVwIHRocm93cyBleGNl cHRpb24gYWZ0ZXIgYnVpbGRtYXN0ZXIgdXBkYXRlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDI0OQogCg==