37487 2010-04-12 21:29:50 -0700 Make new-run-webkit-test PrettyPatch failure reporting more awesome 2010-04-12 22:07:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned abarth dbates dpranke dumi tony oldest_to_newest 211842 0 eric 2010-04-12 21:29:50 -0700 Make new-run-webkit-test PrettyPatch failure reporting more awesome 211843 1 53222 eric 2010-04-12 21:32:23 -0700 Created attachment 53222 Patch 211845 2 53222 abarth 2010-04-12 21:36:34 -0700 Comment on attachment 53222 Patch ok. missing a space 211846 3 eric 2010-04-12 21:38:45 -0700 Committed r57500: <http://trac.webkit.org/changeset/57500> 211847 4 53222 dpranke 2010-04-12 21:42:58 -0700 Comment on attachment 53222 Patch > command = ["ruby", "-I", pretty_patch_path, prettify_path, diff_path] > try: > return self._executive.run_command(command) > except OSError, e: > - # If they system is missing ruby just log the error, and stop trying. > + # If the system is missing ruby log the error and stop trying. > _pretty_patch_available = False > - return "Failed to run PrettyPatch: %s" % e > - except Executive.ScriptError, e: > - # If they system is missing ruby just log the error, and stop trying. > + _log.error("Failed to run PrettyPatch (%s): %s" % (command, e)) > + return self._pretty_patch_error_html > + except ScriptError, e: > + # If ruby failed to run for some reason, log the command output and stop trying. > _pretty_patch_available = False > - return "Failed to run PrettyPatch: %s" % e > + _log.error("Failed to run PrettyPatch (%s):\n%s" % (command, e.message_with_output())) > + return self._pretty_patch_error_html > Why does this routine have to catch either a ScriptError or an OSError? It seems like maybe the run_command() semantics aren't clear? 211849 5 eric 2010-04-12 21:46:28 -0700 They mean different things. OSError means you're missing the file you tried to run. ScriptError means it returned non-zero. 53222 2010-04-12 21:32:23 -0700 2010-04-12 21:42:58 -0700 Patch bug-37487-20100412213222.patch text/plain 3009 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1NWZmMWVhLi42YjM3YjYwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMTAtMDQt MTIgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgbmV3LXJ1bi13ZWJraXQtdGVzdCBQcmV0 dHlQYXRjaCBmYWlsdXJlIHJlcG9ydGluZyBtb3JlIGF3ZXNvbWUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3NDg3CisKKyAgICAgICAgSSBhbHNvIGZp eGVkIGFuIEV4ZWN1dGl2ZS9leGVjdXRpdmUgdHlwby4KKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weToKKworMjAxMC0wNC0xMiAgRXJpYyBTZWlk ZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4K IAogICAgICAgICBuZXctcnVuLXdlYmtpdC10ZXN0cyBzaG91bGQgb25seSBidWlsZCBqYXZhIHN1 cHBvcnQgZmlsZXMgb24gTWFjCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKaW5kZXggNDFiMjBkNS4uNjhmYTE4NiAxMDA2 NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9i YXNlLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvYmFzZS5weQpAQCAtNDIsNyArNDIsMTIgQEAgaW1wb3J0IGFwYWNoZV9odHRwX3NlcnZlcgog aW1wb3J0IGh0dHBfc2VydmVyCiBpbXBvcnQgd2Vic29ja2V0X3NlcnZlcgogCi1mcm9tIHdlYmtp dHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBFeGVjdXRpdmUKK2Zyb20gd2Via2l0 cHkuY29tbW9uLnN5c3RlbSBpbXBvcnQgbG9ndXRpbHMKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5 c3RlbS5leGVjdXRpdmUgaW1wb3J0IEV4ZWN1dGl2ZSwgU2NyaXB0RXJyb3IKKworCitfbG9nID0g bG9ndXRpbHMuZ2V0X2xvZ2dlcihfX2ZpbGVfXykKKwogCiAjIFB5dGhvbiBidWcgd29ya2Fyb3Vu ZC4gIFNlZSBQb3J0LndkaWZmX3RleHQoKSBmb3IgYW4gZXhwbGFuYXRpb24uCiBfd2RpZmZfYXZh aWxhYmxlID0gVHJ1ZQpAQCAtNTY0LDIzICs1NjksMjYgQEAgY2xhc3MgUG9ydChvYmplY3QpOgog ICAgICAgICAgICAgICAgIHJhaXNlIGUKICAgICAgICAgcmV0dXJuIHJlc3VsdAogCisgICAgX3By ZXR0eV9wYXRjaF9lcnJvcl9odG1sID0gIkZhaWxlZCB0byBydW4gUHJldHR5UGF0Y2gsIHNlZSBl cnJvciBjb25zb2xlLiIKICAgICBkZWYgcHJldHR5X3BhdGNoX3RleHQoc2VsZiwgZGlmZl9wYXRo KToKICAgICAgICAgZ2xvYmFsIF9wcmV0dHlfcGF0Y2hfYXZhaWxhYmxlCiAgICAgICAgIGlmIG5v dCBfcHJldHR5X3BhdGNoX2F2YWlsYWJsZToKLSAgICAgICAgICAgIHJldHVybiAiRmFpbGVkIHRv IHJ1biBQcmV0dHlQYXRjaCIKKyAgICAgICAgICAgIHJldHVybiBzZWxmLl9wcmV0dHlfcGF0Y2hf ZXJyb3JfaHRtbAogICAgICAgICBwcmV0dHlfcGF0Y2hfcGF0aCA9IHNlbGYucGF0aF9mcm9tX3dl YmtpdF9iYXNlKCJCdWdzU2l0ZSIsICJQcmV0dHlQYXRjaCIpCiAgICAgICAgIHByZXR0aWZ5X3Bh dGggPSBvcy5wYXRoLmpvaW4ocHJldHR5X3BhdGNoX3BhdGgsICJwcmV0dGlmeS5yYiIpCiAgICAg ICAgIGNvbW1hbmQgPSBbInJ1YnkiLCAiLUkiLCBwcmV0dHlfcGF0Y2hfcGF0aCwgcHJldHRpZnlf cGF0aCwgZGlmZl9wYXRoXQogICAgICAgICB0cnk6CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5f ZXhlY3V0aXZlLnJ1bl9jb21tYW5kKGNvbW1hbmQpCiAgICAgICAgIGV4Y2VwdCBPU0Vycm9yLCBl OgotICAgICAgICAgICAgIyBJZiB0aGV5IHN5c3RlbSBpcyBtaXNzaW5nIHJ1YnkganVzdCBsb2cg dGhlIGVycm9yLCBhbmQgc3RvcCB0cnlpbmcuCisgICAgICAgICAgICAjIElmIHRoZSBzeXN0ZW0g aXMgbWlzc2luZyBydWJ5IGxvZyB0aGUgZXJyb3IgYW5kIHN0b3AgdHJ5aW5nLgogICAgICAgICAg ICAgX3ByZXR0eV9wYXRjaF9hdmFpbGFibGUgPSBGYWxzZQotICAgICAgICAgICAgcmV0dXJuICJG YWlsZWQgdG8gcnVuIFByZXR0eVBhdGNoOiAlcyIgJSBlCi0gICAgICAgIGV4Y2VwdCBFeGVjdXRp dmUuU2NyaXB0RXJyb3IsIGU6Ci0gICAgICAgICAgICAjIElmIHRoZXkgc3lzdGVtIGlzIG1pc3Np bmcgcnVieSBqdXN0IGxvZyB0aGUgZXJyb3IsIGFuZCBzdG9wIHRyeWluZy4KKyAgICAgICAgICAg IF9sb2cuZXJyb3IoIkZhaWxlZCB0byBydW4gUHJldHR5UGF0Y2ggKCVzKTogJXMiICUgKGNvbW1h bmQsIGUpKQorICAgICAgICAgICAgcmV0dXJuIHNlbGYuX3ByZXR0eV9wYXRjaF9lcnJvcl9odG1s CisgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwgZToKKyAgICAgICAgICAgICMgSWYgcnVieSBm YWlsZWQgdG8gcnVuIGZvciBzb21lIHJlYXNvbiwgbG9nIHRoZSBjb21tYW5kIG91dHB1dCBhbmQg c3RvcCB0cnlpbmcuCiAgICAgICAgICAgICBfcHJldHR5X3BhdGNoX2F2YWlsYWJsZSA9IEZhbHNl Ci0gICAgICAgICAgICByZXR1cm4gIkZhaWxlZCB0byBydW4gUHJldHR5UGF0Y2g6ICVzIiAlIGUK KyAgICAgICAgICAgIF9sb2cuZXJyb3IoIkZhaWxlZCB0byBydW4gUHJldHR5UGF0Y2ggKCVzKTpc biVzIiAlIChjb21tYW5kLCBlLm1lc3NhZ2Vfd2l0aF9vdXRwdXQoKSkpCisgICAgICAgICAgICBy ZXR1cm4gc2VsZi5fcHJldHR5X3BhdGNoX2Vycm9yX2h0bWwKIAogICAgIGRlZiBkZWZhdWx0X2Nv bmZpZ3VyYXRpb24oc2VsZik6CiAgICAgICAgIHJldHVybiAiUmVsZWFzZSIK