34070 2010-01-24 23:23:14 -0800 Fix failure of webkit-patch unit test webkitpy.scm_unittest.SCMClassTests.test_error_handlers 2010-01-26 21:26:27 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dbates webkit-unassigned abarth eric oldest_to_newest 184180 0 dbates 2010-01-24 23:23:14 -0800 Following up on Eric Seidel's comment <https://bugs.webkit.org/show_bug.cgi?id=32896#c10>, the changes introduced in the patch for bug #32896 caused the method webkitpy.scm_unittest.SCMClassTests.test_error_handlers to fail with the following error: ====================================================================== ERROR: test_error_handlers (webkitpy.scm_unittest.SCMClassTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/dbates/Desktop/WebKit/WebKitTools/Scripts/webkitpy/scm_unittest.py", line 150, in test_error_handlers self.assertRaises(OSError, run_command, command_does_not_exist) File "/System/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/unittest.py", line 336, in failUnlessRaises callableObj(*args, **kwargs) File "/Users/dbates/Desktop/WebKit/WebKitTools/Scripts/webkitpy/executive.py", line 70, in run_command return Executive().run_command(*args, **kwargs) File "/Users/dbates/Desktop/WebKit/WebKitTools/Scripts/webkitpy/executive.py", line 142, in run_command (error_handler or self.default_error_handler)(script_error) File "/Users/dbates/Desktop/WebKit/WebKitTools/Scripts/webkitpy/executive.py", line 113, in default_error_handler raise error ScriptError: Failed to run "['does_not_exist', 'invalid_option']" exit_code: 2 184181 1 47317 dbates 2010-01-24 23:26:52 -0800 Created attachment 47317 Patch with unit test Moves the try/catch for OSError exceptions in Executive.run_command to Credentials.read_credentials() so that the unit test webkitpy.scm_unittest.SCMClassTests.test_error_handlers can assert that Executive.run_command throws an OSError exception. Updated unit tests accordingly. 184219 2 47317 abarth 2010-01-25 02:45:54 -0800 Comment on attachment 47317 Patch with unit test Thanks! 184932 3 dbates 2010-01-26 21:26:27 -0800 Committed r53896: <http://trac.webkit.org/changeset/53896> 47317 2010-01-24 23:26:52 -0800 2010-01-25 02:45:54 -0800 Patch with unit test Bug34070.patch text/plain 4840 dbates SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDUzNzg0KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAtMDEtMjQgIERhbmllbCBCYXRlcyAgPGRi YXRlc0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDA3MAor CisgICAgICAgIE1vdmVzIHRoZSB0cnkvY2F0Y2ggZm9yIE9TRXJyb3IgZXhjZXB0aW9ucyBpbiBF eGVjdXRpdmUucnVuX2NvbW1hbmQKKyAgICAgICAgdG8gQ3JlZGVudGlhbHMucmVhZF9jcmVkZW50 aWFscygpIHNvIHRoYXQgdGhlIHVuaXQgdGVzdAorICAgICAgICB3ZWJraXRweS5zY21fdW5pdHRl c3QuU0NNQ2xhc3NUZXN0cy50ZXN0X2Vycm9yX2hhbmRsZXJzIGNhbgorICAgICAgICBhc3NlcnQg dGhhdCBFeGVjdXRpdmUucnVuX2NvbW1hbmQgdGhyb3dzIGFuIE9TRXJyb3IgZXhjZXB0aW9uLgor CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jcmVkZW50aWFscy5weToKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2V4ZWN1dGl2ZS5weTogTW92ZWQgdHJ5L2NhdGNoIGZvciBPU0Vycm9y IHRvCisgICAgICAgIG1ldGhvZCBDcmVkZW50aWFscy5yZWFkX2NyZWRlbnRpYWxzKCkuCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9leGVjdXRpdmVfdW5pdHRlc3QucHk6IFJlbW92ZWQgdGVz dHMgdGhhdCBubyBsb25nZXIKKyAgICAgICAgYXBwbHk6IHRlc3RfcnVuX2NvbW1hbmRfd2l0aF9i YWRfY29tbWFuZF9jaGVja19yZXR1cm5fY29kZSBhbmQKKyAgICAgICAgdGVzdF9ydW5fY29tbWFu ZF93aXRoX2JhZF9jb21tYW5kX2NoZWNrX2NhbGxzX2Vycm9yX2hhbmRsZXIuIEFkZGVkIG5ldwor ICAgICAgICB0ZXN0IHRvIGFzc2VydCB0aGF0IHJ1bl9jb21tYW5kIHRocm93cyBPU0Vycm9yIGV4 Y2VwdGlvbnMuCisKIDIwMTAtMDEtMjQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgog CiAgICAgICAgIE5vIHJldmlldywgcm9sbGluZyBvdXQgcjUzNzYzLgpJbmRleDogV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS9jcmVkZW50aWFscy5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2NyZWRlbnRpYWxzLnB5CShyZXZpc2lvbiA1Mzc1MSkKKysr IFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY3JlZGVudGlhbHMucHkJKHdvcmtpbmcgY29w eSkKQEAgLTkzLDggKzkzLDE0IEBAIGNsYXNzIENyZWRlbnRpYWxzKG9iamVjdCk6CiAgICAgICAg IHVzZXJuYW1lID0gTm9uZQogICAgICAgICBwYXNzd29yZCA9IE5vbmUKIAotICAgICAgICBpZiBH aXQuaW5fd29ya2luZ19kaXJlY3Rvcnkoc2VsZi5jd2QpOgotICAgICAgICAgICAgKHVzZXJuYW1l LCBwYXNzd29yZCkgPSBzZWxmLl9jcmVkZW50aWFsc19mcm9tX2dpdCgpCisgICAgICAgIHRyeToK KyAgICAgICAgICAgIGlmIEdpdC5pbl93b3JraW5nX2RpcmVjdG9yeShzZWxmLmN3ZCk6CisgICAg ICAgICAgICAgICAgKHVzZXJuYW1lLCBwYXNzd29yZCkgPSBzZWxmLl9jcmVkZW50aWFsc19mcm9t X2dpdCgpCisgICAgICAgIGV4Y2VwdCBPU0Vycm9yLCBlOgorICAgICAgICAgICAgIyBDYXRjaCBh bmQgaWdub3JlIE9TRXJyb3IgZXhjZXB0aW9ucyBzdWNoIGFzICJubyBzdWNoIGZpbGUgCisgICAg ICAgICAgICAjIG9yIGRpcmVjdG9yeSIgKE9TRXJyb3IgZXJybm8gMiksIHdoaWNoIGltcGx5IHRo YXQgdGhlIEdpdAorICAgICAgICAgICAgIyBjb21tYW5kIGNhbm5vdCBiZSBmb3VuZC9pcyBub3Qg aW5zdGFsbGVkLgorICAgICAgICAgICAgcGFzcwogCiAgICAgICAgIGlmIG5vdCB1c2VybmFtZSBv ciBub3QgcGFzc3dvcmQ6CiAgICAgICAgICAgICAodXNlcm5hbWUsIHBhc3N3b3JkKSA9IHNlbGYu X2NyZWRlbnRpYWxzX2Zyb21fa2V5Y2hhaW4odXNlcm5hbWUpCkluZGV4OiBXZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2V4ZWN1dGl2ZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2V4ZWN1dGl2ZS5weQkocmV2aXNpb24gNTM3NTEpCisrKyBXZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2V4ZWN1dGl2ZS5weQkod29ya2luZyBjb3B5KQpAQCAtMTI4 LDE1ICsxMjgsOSBAQCBjbGFzcyBFeGVjdXRpdmUob2JqZWN0KToKICAgICAgICAgICAgIHN0ZGVy ciA9IHN1YnByb2Nlc3MuU1RET1VUCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBzdGRlcnIg PSBOb25lCi0gICAgICAgIHRyeToKLSAgICAgICAgICAgIHByb2Nlc3MgPSBzdWJwcm9jZXNzLlBv cGVuKGFyZ3MsIHN0ZGluPXN0ZGluLCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLCBzdGRlcnI9c3Rk ZXJyLCBjd2Q9Y3dkKQotICAgICAgICAgICAgb3V0cHV0ID0gcHJvY2Vzcy5jb21tdW5pY2F0ZShz dHJpbmdfdG9fY29tbXVuaWNhdGUpWzBdCi0gICAgICAgICAgICBleGl0X2NvZGUgPSBwcm9jZXNz LndhaXQoKQotICAgICAgICBleGNlcHQgT1NFcnJvciwgZToKLSAgICAgICAgICAgICMgQ2F0Y2gg T1NFcnJvciBleGNlcHRpb25zLiBGb3IgZXhhbXBsZSwgIm5vIHN1Y2ggZmlsZSBvciBkaXJlY3Rv cnkiIChpLmUuIE9TRXJyb3IgZXJybm8gMiksCi0gICAgICAgICAgICAjIHdoZW4gdGhlIGNvbW1h bmQgY2Fubm90IGJlIGZvdW5kLgotICAgICAgICAgICAgb3V0cHV0ID0gZS5zdHJlcnJvcgotICAg ICAgICAgICAgZXhpdF9jb2RlID0gZS5lcnJubworICAgICAgICBwcm9jZXNzID0gc3VicHJvY2Vz cy5Qb3BlbihhcmdzLCBzdGRpbj1zdGRpbiwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSwgc3RkZXJy PXN0ZGVyciwgY3dkPWN3ZCkKKyAgICAgICAgb3V0cHV0ID0gcHJvY2Vzcy5jb21tdW5pY2F0ZShz dHJpbmdfdG9fY29tbXVuaWNhdGUpWzBdCisgICAgICAgIGV4aXRfY29kZSA9IHByb2Nlc3Mud2Fp dCgpCiAgICAgICAgIGlmIGV4aXRfY29kZToKICAgICAgICAgICAgIHNjcmlwdF9lcnJvciA9IFNj cmlwdEVycm9yKHNjcmlwdF9hcmdzPWFyZ3MsIGV4aXRfY29kZT1leGl0X2NvZGUsIG91dHB1dD1v dXRwdXQsIGN3ZD1jd2QpCiAgICAgICAgICAgICAoZXJyb3JfaGFuZGxlciBvciBzZWxmLmRlZmF1 bHRfZXJyb3JfaGFuZGxlcikoc2NyaXB0X2Vycm9yKQpJbmRleDogV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9leGVjdXRpdmVfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS9leGVjdXRpdmVfdW5pdHRlc3QucHkJKHJldmlzaW9uIDUzNzUx KQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9leGVjdXRpdmVfdW5pdHRlc3QucHkJ KHdvcmtpbmcgY29weSkKQEAgLTI4LDIxICsyOCwxNCBAQAogIyBPRiBUSElTIFNPRlRXQVJFLCBF VkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiBpbXBv cnQgdW5pdHRlc3QKLWZyb20gd2Via2l0cHkuZXhlY3V0aXZlIGltcG9ydCBFeGVjdXRpdmUsIFNj cmlwdEVycm9yLCBydW5fY29tbWFuZAorZnJvbSB3ZWJraXRweS5leGVjdXRpdmUgaW1wb3J0IEV4 ZWN1dGl2ZSwgcnVuX2NvbW1hbmQKIAogY2xhc3MgRXhlY3V0aXZlVGVzdCh1bml0dGVzdC5UZXN0 Q2FzZSk6CiAKLSAgICBkZWYgdGVzdF9ydW5fY29tbWFuZF93aXRoX2JhZF9jb21tYW5kX2NoZWNr X3JldHVybl9jb2RlKHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJ1bl9jb21tYW5k KFsiZm9vX2Jhcl9jb21tYW5kX2JsYWgiXSwgZXJyb3JfaGFuZGxlcj1FeGVjdXRpdmUuaWdub3Jl X2Vycm9yLCByZXR1cm5fZXhpdF9jb2RlPVRydWUpLCAyKQotCi0gICAgZGVmIHRlc3RfcnVuX2Nv bW1hbmRfd2l0aF9iYWRfY29tbWFuZF9jaGVja19jYWxsc19lcnJvcl9oYW5kbGVyKHNlbGYpOgot ICAgICAgICBzZWxmLmRpZEhhbmRsZUVycm9yR2V0Q2FsbGVkID0gRmFsc2UKLSAgICAgICAgZGVm IGhhbmRsZUVycm9yKHNjcmlwdEVycm9yKToKLSAgICAgICAgICAgIHNlbGYuZGlkSGFuZGxlRXJy b3JHZXRDYWxsZWQgPSBUcnVlCi0gICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNjcmlwdEVy cm9yLmV4aXRfY29kZSwgMikKLQotICAgICAgICBydW5fY29tbWFuZChbImZvb19iYXJfY29tbWFu ZF9ibGFoIl0sIGVycm9yX2hhbmRsZXI9aGFuZGxlRXJyb3IpCi0gICAgICAgIHNlbGYuYXNzZXJ0 VHJ1ZShzZWxmLmRpZEhhbmRsZUVycm9yR2V0Q2FsbGVkKQorICAgIGRlZiB0ZXN0X3J1bl9jb21t YW5kX3dpdGhfYmFkX2NvbW1hbmQoc2VsZik6CisgICAgICAgIGRlZiBydW5fYmFkX2NvbW1hbmQo KToKKyAgICAgICAgICAgIHJ1bl9jb21tYW5kKFsiZm9vX2Jhcl9jb21tYW5kX2JsYWgiXSwgZXJy b3JfaGFuZGxlcj1FeGVjdXRpdmUuaWdub3JlX2Vycm9yLCByZXR1cm5fZXhpdF9jb2RlPVRydWUp CisgICAgICAgIHNlbGYuZmFpbFVubGVzc1JhaXNlcyhPU0Vycm9yLCBydW5fYmFkX2NvbW1hbmQp CiAKIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6CiAgICAgdW5pdHRlc3QubWFpbigpCg==