76802 2012-01-22 18:16:06 -0800 run-perf-tests should report server-side errors 2012-01-23 15:49:07 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 10266 1 rniwa rniwa abarth dpranke eric ojan webkit.review.bot oldest_to_newest 540344 0 rniwa 2012-01-22 18:16:06 -0800 webkit-perf.appspot.com may reject uploaded jsons for reasons other than network errors. e.g. malformed data. run-perf-tests should report those errors. 540353 1 123509 rniwa 2012-01-22 19:24:10 -0800 Created attachment 123509 fixes the bug 540618 2 123509 tony 2012-01-23 09:47:30 -0800 Comment on attachment 123509 fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=123509&action=review > Tools/Scripts/webkitpy/common/net/file_uploader.py:116 > - NetworkTransaction(timeout_seconds=self._timeout_seconds).run(callback) > + response = NetworkTransaction(timeout_seconds=self._timeout_seconds).run(callback) > finally: > socket.setdefaulttimeout(orig_timeout) > + return response Do we need to define response outside of the try? Otherwise if response doesn't get set, you'll get an UnboundLocalError exception. > Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py:183 > + response_body = [line.strip('\n') for line in response] > + if response_body != ['OK']: Can you just check for response.strip('\n') == 'OK'? 540663 3 123509 rniwa 2012-01-23 11:03:04 -0800 Comment on attachment 123509 fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=123509&action=review >> Tools/Scripts/webkitpy/common/net/file_uploader.py:116 >> + return response > > Do we need to define response outside of the try? Otherwise if response doesn't get set, you'll get an UnboundLocalError exception. Oops, yes, I should set it to None. It's very annoying that we can't create a unit test for this function :( >> Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py:183 >> + if response_body != ['OK']: > > Can you just check for response.strip('\n') == 'OK'? response is a file-like object so not sure if we can do that. I was initially fetching only the first line but then it didn't really matter because the for-loop terminates after one iteration when the response is just 'OK' and we have to read the entire response otherwise anyways. 540667 4 123509 tony 2012-01-23 11:08:57 -0800 Comment on attachment 123509 fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=123509&action=review >>> Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py:183 >>> + if response_body != ['OK']: >> >> Can you just check for response.strip('\n') == 'OK'? > > response is a file-like object so not sure if we can do that. I was initially fetching only the first line but then it didn't really matter because the for-loop terminates after one iteration when the response is just 'OK' and we have to read the entire response otherwise anyways. You could do response.read().strip('\n') and store that in a variable. I guess that's about the same amount of code. *shrug* 540687 5 123509 rniwa 2012-01-23 11:23:39 -0800 Comment on attachment 123509 fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=123509&action=review >>>> Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py:183 >>>> + if response_body != ['OK']: >>> >>> Can you just check for response.strip('\n') == 'OK'? >> >> response is a file-like object so not sure if we can do that. I was initially fetching only the first line but then it didn't really matter because the for-loop terminates after one iteration when the response is just 'OK' and we have to read the entire response otherwise anyways. > > You could do response.read().strip('\n') and store that in a variable. I guess that's about the same amount of code. *shrug* But then I'd have to store that value when it doesn't match 'OK' or else I'd have to manually seek back (not even sure if we can do that on the response). 540789 6 123611 rniwa 2012-01-23 13:33:27 -0800 Created attachment 123611 Fixed the bug pointed out by Tony 540806 7 123611 dpranke 2012-01-23 13:48:27 -0800 Comment on attachment 123611 Fixed the bug pointed out by Tony View in context: https://bugs.webkit.org/attachment.cgi?id=123611&action=review change looks fine to me but I'll let tony r+ it. > Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py:183 > + if response_body != ['OK']: Minor nit: why not just delete 182 and change 183 to <code>if response_body != ['OK\n']:</code>? 540811 8 123611 rniwa 2012-01-23 13:51:42 -0800 Comment on attachment 123611 Fixed the bug pointed out by Tony View in context: https://bugs.webkit.org/attachment.cgi?id=123611&action=review >> Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py:183 >> + if response_body != ['OK']: > > Minor nit: why not just delete 182 and change 183 to <code>if response_body != ['OK\n']:</code>? If I do that, then I'd have to call stip on each line when we output the error. 540813 9 123611 dpranke 2012-01-23 13:53:08 -0800 Comment on attachment 123611 Fixed the bug pointed out by Tony View in context: https://bugs.webkit.org/attachment.cgi?id=123611&action=review >>> Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py:183 >>> + if response_body != ['OK']: >> >> Minor nit: why not just delete 182 and change 183 to <code>if response_body != ['OK\n']:</code>? > > If I do that, then I'd have to call stip on each line when we output the error. Ah, fair enough. 540906 10 123611 rniwa 2012-01-23 15:49:02 -0800 Comment on attachment 123611 Fixed the bug pointed out by Tony Clearing flags on attachment: 123611 Committed r105650: <http://trac.webkit.org/changeset/105650> 540907 11 rniwa 2012-01-23 15:49:07 -0800 All reviewed patches have been landed. Closing bug. 123509 2012-01-22 19:24:10 -0800 2012-01-23 13:33:22 -0800 fixes the bug bug-76802-20120122192409.patch text/plain 6400 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEwNTU5MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDEyLTAxLTIyICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIHJ1bi1wZXJmLXRlc3RzIHNob3VsZCByZXBvcnQgc2VydmVyLXNpZGUgZXJyb3Jz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NjgwMgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlcG9ydCBl cnJvcnMgd2hlbmV2ZXIgc2VydmVyJ3MgcmVzcG9uc2UgZG9lc24ndCBtYXRjaCAiT0siLgorCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2ZpbGVfdXBsb2FkZXIucHk6Cisg ICAgICAgIChGaWxlVXBsb2FkZXIudXBsb2FkX3NpbmdsZV90ZXh0X2ZpbGUpOgorICAgICAgICAo RmlsZVVwbG9hZGVyLnVwbG9hZF9hc19tdWx0aXBhcnRfZm9ybV9kYXRhKToKKyAgICAgICAgKEZp bGVVcGxvYWRlci5fdXBsb2FkX2RhdGEuY2FsbGJhY2spOgorICAgICAgICAoRmlsZVVwbG9hZGVy KToKKyAgICAgICAgKEZpbGVVcGxvYWRlci5fdXBsb2FkX2RhdGEpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5OgorICAgICAg ICAoUGVyZlRlc3RzUnVubmVyLl91cGxvYWRfanNvbik6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXJfdW5pdHRlc3QucHk6CisgICAg ICAgICh0ZXN0X3VwbG9hZF9qc29uKToKKyAgICAgICAgKHRlc3RfdXBsb2FkX2pzb24uTW9ja0Zp bGVVcGxvYWRlci51cGxvYWRfc2luZ2xlX3RleHRfZmlsZSk6CisKIDIwMTItMDEtMjIgIFJ5b3N1 a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgV2luZG93cyBweXRob24gdGVz dCBidWlsZCBmaXguCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvZmls ZV91cGxvYWRlci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9uZXQvZmlsZV91cGxvYWRlci5weQkocmV2aXNpb24gMTA1NTQzKQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vbmV0L2ZpbGVfdXBsb2FkZXIucHkJKHdvcmtpbmcgY29weSkKQEAg LTg5LDcgKzg5LDcgQEAgY2xhc3MgRmlsZVVwbG9hZGVyKG9iamVjdCk6CiAgICAgICAgIHNlbGYu X3RpbWVvdXRfc2Vjb25kcyA9IHRpbWVvdXRfc2Vjb25kcwogCiAgICAgZGVmIHVwbG9hZF9zaW5n bGVfdGV4dF9maWxlKHNlbGYsIGZpbGVzeXN0ZW0sIGNvbnRlbnRfdHlwZSwgZmlsZW5hbWUpOgot ICAgICAgICBzZWxmLl91cGxvYWRfZGF0YShjb250ZW50X3R5cGUsIGZpbGVzeXN0ZW0ucmVhZF90 ZXh0X2ZpbGUoZmlsZW5hbWUpKQorICAgICAgICByZXR1cm4gc2VsZi5fdXBsb2FkX2RhdGEoY29u dGVudF90eXBlLCBmaWxlc3lzdGVtLnJlYWRfdGV4dF9maWxlKGZpbGVuYW1lKSkKIAogICAgIGRl ZiB1cGxvYWRfYXNfbXVsdGlwYXJ0X2Zvcm1fZGF0YShzZWxmLCBmaWxlc3lzdGVtLCBmaWxlcywg cGFyYW1zLCB0aW1lb3V0X3NlY29uZHMpOgogICAgICAgICBmaWxlX29ianMgPSBbXQpAQCAtOTks MTcgKzk5LDE4IEBAIGNsYXNzIEZpbGVVcGxvYWRlcihvYmplY3QpOgogCiAgICAgICAgICMgRklY TUU6IFdlIHNob3VsZCB1c2UgdGhlIHNhbWUgdmFyaWFibGUgbmFtZXMgZm9yIHRoZSBmb3JtYWwg YW5kIGFjdHVhbCBwYXJhbWV0ZXJzLgogICAgICAgICBjb250ZW50X3R5cGUsIGRhdGEgPSBfZW5j b2RlX211bHRpcGFydF9mb3JtX2RhdGEoYXR0cnMsIGZpbGVfb2JqcykKLSAgICAgICAgc2VsZi5f dXBsb2FkX2RhdGEoY29udGVudF90eXBlLCBkYXRhKQorICAgICAgICByZXR1cm4gc2VsZi5fdXBs b2FkX2RhdGEoY29udGVudF90eXBlLCBkYXRhKQogCiAgICAgZGVmIF91cGxvYWRfZGF0YShzZWxm LCBjb250ZW50X3R5cGUsIGRhdGEpOgogICAgICAgICBkZWYgY2FsbGJhY2soKToKICAgICAgICAg ICAgIHJlcXVlc3QgPSB1cmxsaWIyLlJlcXVlc3Qoc2VsZi5fdXJsLCBkYXRhLCB7IkNvbnRlbnQt VHlwZSI6IGNvbnRlbnRfdHlwZX0pCi0gICAgICAgICAgICB1cmxsaWIyLnVybG9wZW4ocmVxdWVz dCkKKyAgICAgICAgICAgIHJldHVybiB1cmxsaWIyLnVybG9wZW4ocmVxdWVzdCkKIAogICAgICAg ICBvcmlnX3RpbWVvdXQgPSBzb2NrZXQuZ2V0ZGVmYXVsdHRpbWVvdXQoKQogICAgICAgICB0cnk6 CiAgICAgICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGRuJ3QgbXV0YXRlIGdsb2JhbCBzdGF0aWMg c3RhdGUuCiAgICAgICAgICAgICBzb2NrZXQuc2V0ZGVmYXVsdHRpbWVvdXQoc2VsZi5fdGltZW91 dF9zZWNvbmRzKQotICAgICAgICAgICAgTmV0d29ya1RyYW5zYWN0aW9uKHRpbWVvdXRfc2Vjb25k cz1zZWxmLl90aW1lb3V0X3NlY29uZHMpLnJ1bihjYWxsYmFjaykKKyAgICAgICAgICAgIHJlc3Bv bnNlID0gTmV0d29ya1RyYW5zYWN0aW9uKHRpbWVvdXRfc2Vjb25kcz1zZWxmLl90aW1lb3V0X3Nl Y29uZHMpLnJ1bihjYWxsYmFjaykKICAgICAgICAgZmluYWxseToKICAgICAgICAgICAgIHNvY2tl dC5zZXRkZWZhdWx0dGltZW91dChvcmlnX3RpbWVvdXQpCisgICAgICAgICAgICByZXR1cm4gcmVz cG9uc2UKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVy ZnRlc3RzcnVubmVyLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVy Zm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5CShyZXZpc2lvbiAxMDU1NDMpCisrKyBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5w eQkod29ya2luZyBjb3B5KQpAQCAtMTc0LDExICsxNzQsMTggQEAgY2xhc3MgUGVyZlRlc3RzUnVu bmVyKG9iamVjdCk6CiAgICAgZGVmIF91cGxvYWRfanNvbihzZWxmLCB0ZXN0X3Jlc3VsdHNfc2Vy dmVyLCBqc29uX3BhdGgsIGZpbGVfdXBsb2FkZXI9RmlsZVVwbG9hZGVyKToKICAgICAgICAgdXBs b2FkZXIgPSBmaWxlX3VwbG9hZGVyKCJodHRwczovLyVzL2FwaS90ZXN0L3JlcG9ydCIgJSB0ZXN0 X3Jlc3VsdHNfc2VydmVyLCAxMjApCiAgICAgICAgIHRyeToKLSAgICAgICAgICAgIHVwbG9hZGVy LnVwbG9hZF9zaW5nbGVfdGV4dF9maWxlKHNlbGYuX2hvc3QuZmlsZXN5c3RlbSwgJ2FwcGxpY2F0 aW9uL2pzb24nLCBqc29uX3BhdGgpCisgICAgICAgICAgICByZXNwb25zZSA9IHVwbG9hZGVyLnVw bG9hZF9zaW5nbGVfdGV4dF9maWxlKHNlbGYuX2hvc3QuZmlsZXN5c3RlbSwgJ2FwcGxpY2F0aW9u L2pzb24nLCBqc29uX3BhdGgpCiAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24sIGVycm9yOgogICAg ICAgICAgICAgX2xvZy5lcnJvcigiRmFpbGVkIHRvIHVwbG9hZCBKU09OIGZpbGUgaW4gMTIwczog JXMiICUgZXJyb3IpCiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKIAorICAgICAgICByZXNwb25z ZV9ib2R5ID0gW2xpbmUuc3RyaXAoJ1xuJykgZm9yIGxpbmUgaW4gcmVzcG9uc2VdCisgICAgICAg IGlmIHJlc3BvbnNlX2JvZHkgIT0gWydPSyddOgorICAgICAgICAgICAgX2xvZy5lcnJvcigiVXBs b2FkZWQgSlNPTiBidXQgZ290IGEgYmFkIHJlc3BvbnNlOiIpCisgICAgICAgICAgICBmb3IgbGlu ZSBpbiByZXNwb25zZV9ib2R5OgorICAgICAgICAgICAgICAgIF9sb2cuZXJyb3IobGluZSkKKyAg ICAgICAgICAgIHJldHVybiBGYWxzZQorCiAgICAgICAgIHNlbGYuX3ByaW50ZXIud3JpdGUoIkpT T04gZmlsZSB1cGxvYWRlZC4iKQogICAgICAgICByZXR1cm4gVHJ1ZQogCkluZGV4OiBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lcl91bml0dGVz dC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rl c3RzL3BlcmZ0ZXN0c3J1bm5lcl91bml0dGVzdC5weQkocmV2aXNpb24gMTA1NTQzKQorKysgVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXJfdW5p dHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTI5LDEyICsyOSwxNCBAQAogCiAiIiJVbml0IHRl c3RzIGZvciBydW5fcGVyZl90ZXN0cy4iIiIKIAoraW1wb3J0IFN0cmluZ0lPCiBpbXBvcnQganNv bgogaW1wb3J0IHVuaXR0ZXN0CiAKIGZyb20gd2Via2l0cHkuY29tbW9uIGltcG9ydCBhcnJheV9z dHJlYW0KIGZyb20gd2Via2l0cHkuY29tbW9uLmhvc3RfbW9jayBpbXBvcnQgTW9ja0hvc3QKIGZy b20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5maWxlc3lzdGVtX21vY2sgaW1wb3J0IE1vY2tGaWxl U3lzdGVtCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0ub3V0cHV0Y2FwdHVyZSBpbXBvcnQg T3V0cHV0Q2FwdHVyZQogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydC5kcml2ZXIgaW1w b3J0IERyaXZlcklucHV0LCBEcml2ZXJPdXRwdXQKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3Rz LnBvcnQudGVzdCBpbXBvcnQgVGVzdFBvcnQKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnZp ZXdzIGltcG9ydCBwcmludGluZwpAQCAtMjQwLDExICsyNDIsMTIgQEAgbWF4IDExMjAKIAogICAg IGRlZiB0ZXN0X3VwbG9hZF9qc29uKHNlbGYpOgogICAgICAgICByZWd1bGFyX291dHB1dCA9IGFy cmF5X3N0cmVhbS5BcnJheVN0cmVhbSgpCi0gICAgICAgIHJ1bm5lciA9IHNlbGYuY3JlYXRlX3J1 bm5lcihidWlsZGJvdF9vdXRwdXQ9cmVndWxhcl9vdXRwdXQpCisgICAgICAgIHJ1bm5lciA9IHNl bGYuY3JlYXRlX3J1bm5lcihyZWd1bGFyX291dHB1dD1yZWd1bGFyX291dHB1dCkKICAgICAgICAg cnVubmVyLl9ob3N0LmZpbGVzeXN0ZW0uZmlsZXNbJy9tb2NrLWNoZWNrb3V0L3NvbWUuanNvbidd ID0gJ3NvbWUgY29udGVudCcKIAogICAgICAgICBjYWxsZWQgPSBbXQogICAgICAgICB1cGxvYWRf c2luZ2xlX3RleHRfZmlsZV90aHJvd3MgPSBGYWxzZQorICAgICAgICB1cGxvYWRfc2luZ2xlX3Rl eHRfZmlsZV9yZXR1cm5fdmFsdWUgPSBTdHJpbmdJTy5TdHJpbmdJTygnT0snKQogCiAgICAgICAg IGNsYXNzIE1vY2tGaWxlVXBsb2FkZXI6CiAgICAgICAgICAgICBkZWYgX19pbml0X18obW9jaywg dXJsLCB0aW1lb3V0KToKQEAgLTI1OSwxMCArMjYyLDE4IEBAIG1heCAxMTIwCiAgICAgICAgICAg ICAgICAgY2FsbGVkLmFwcGVuZCgndXBsb2FkX3NpbmdsZV90ZXh0X2ZpbGUnKQogICAgICAgICAg ICAgICAgIGlmIHVwbG9hZF9zaW5nbGVfdGV4dF9maWxlX3Rocm93czoKICAgICAgICAgICAgICAg ICAgICAgcmFpc2UgIlNvbWUgZXhjZXB0aW9uIgorICAgICAgICAgICAgICAgIHJldHVybiB1cGxv YWRfc2luZ2xlX3RleHRfZmlsZV9yZXR1cm5fdmFsdWUKIAogICAgICAgICBydW5uZXIuX3VwbG9h ZF9qc29uKCdzb21lLmhvc3QnLCAnc29tZS5qc29uJywgTW9ja0ZpbGVVcGxvYWRlcikKICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChjYWxsZWQsIFsnRmlsZVVwbG9hZGVyJywgJ3VwbG9hZF9zaW5n bGVfdGV4dF9maWxlJ10pCiAKKyAgICAgICAgb3V0cHV0ID0gT3V0cHV0Q2FwdHVyZSgpCisgICAg ICAgIG91dHB1dC5jYXB0dXJlX291dHB1dCgpCisgICAgICAgIHVwbG9hZF9zaW5nbGVfdGV4dF9m aWxlX3JldHVybl92YWx1ZSA9IFN0cmluZ0lPLlN0cmluZ0lPKCdTb21lIGVycm9yJykKKyAgICAg ICAgcnVubmVyLl91cGxvYWRfanNvbignc29tZS5ob3N0JywgJ3NvbWUuanNvbicsIE1vY2tGaWxl VXBsb2FkZXIpCisgICAgICAgIF8sIF8sIGxvZ3MgPSBvdXRwdXQucmVzdG9yZV9vdXRwdXQoKQor ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxvZ3MsICdVcGxvYWRlZCBKU09OIGJ1dCBnb3QgYSBi YWQgcmVzcG9uc2U6XG5Tb21lIGVycm9yXG4nKQorCiAgICAgICAgICMgVGhyb3dpbmcgYW4gZXhj ZXB0aW9uIHVwbG9hZF9zaW5nbGVfdGV4dF9maWxlIHNob3VsZG4ndCBibG93IHVwIF91cGxvYWRf anNvbgogICAgICAgICBjYWxsZWQgPSBbXQogICAgICAgICB1cGxvYWRfc2luZ2xlX3RleHRfZmls ZV90aHJvd3MgPSBUcnVlCg== 123611 2012-01-23 13:33:27 -0800 2012-01-23 15:49:02 -0800 Fixed the bug pointed out by Tony bug-76802-20120123133326.patch text/plain 6425 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEwNTU5MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDEyLTAxLTIyICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIHJ1bi1wZXJmLXRlc3RzIHNob3VsZCByZXBvcnQgc2VydmVyLXNpZGUgZXJyb3Jz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NjgwMgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlcG9ydCBl cnJvcnMgd2hlbmV2ZXIgc2VydmVyJ3MgcmVzcG9uc2UgZG9lc24ndCBtYXRjaCAiT0siLgorCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2ZpbGVfdXBsb2FkZXIucHk6Cisg ICAgICAgIChGaWxlVXBsb2FkZXIudXBsb2FkX3NpbmdsZV90ZXh0X2ZpbGUpOgorICAgICAgICAo RmlsZVVwbG9hZGVyLnVwbG9hZF9hc19tdWx0aXBhcnRfZm9ybV9kYXRhKToKKyAgICAgICAgKEZp bGVVcGxvYWRlci5fdXBsb2FkX2RhdGEuY2FsbGJhY2spOgorICAgICAgICAoRmlsZVVwbG9hZGVy KToKKyAgICAgICAgKEZpbGVVcGxvYWRlci5fdXBsb2FkX2RhdGEpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5OgorICAgICAg ICAoUGVyZlRlc3RzUnVubmVyLl91cGxvYWRfanNvbik6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXJfdW5pdHRlc3QucHk6CisgICAg ICAgICh0ZXN0X3VwbG9hZF9qc29uKToKKyAgICAgICAgKHRlc3RfdXBsb2FkX2pzb24uTW9ja0Zp bGVVcGxvYWRlci51cGxvYWRfc2luZ2xlX3RleHRfZmlsZSk6CisKIDIwMTItMDEtMjIgIFJ5b3N1 a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgV2luZG93cyBweXRob24gdGVz dCBidWlsZCBmaXguCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvZmls ZV91cGxvYWRlci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9uZXQvZmlsZV91cGxvYWRlci5weQkocmV2aXNpb24gMTA1NTQzKQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vbmV0L2ZpbGVfdXBsb2FkZXIucHkJKHdvcmtpbmcgY29weSkKQEAg LTg5LDcgKzg5LDcgQEAgY2xhc3MgRmlsZVVwbG9hZGVyKG9iamVjdCk6CiAgICAgICAgIHNlbGYu X3RpbWVvdXRfc2Vjb25kcyA9IHRpbWVvdXRfc2Vjb25kcwogCiAgICAgZGVmIHVwbG9hZF9zaW5n bGVfdGV4dF9maWxlKHNlbGYsIGZpbGVzeXN0ZW0sIGNvbnRlbnRfdHlwZSwgZmlsZW5hbWUpOgot ICAgICAgICBzZWxmLl91cGxvYWRfZGF0YShjb250ZW50X3R5cGUsIGZpbGVzeXN0ZW0ucmVhZF90 ZXh0X2ZpbGUoZmlsZW5hbWUpKQorICAgICAgICByZXR1cm4gc2VsZi5fdXBsb2FkX2RhdGEoY29u dGVudF90eXBlLCBmaWxlc3lzdGVtLnJlYWRfdGV4dF9maWxlKGZpbGVuYW1lKSkKIAogICAgIGRl ZiB1cGxvYWRfYXNfbXVsdGlwYXJ0X2Zvcm1fZGF0YShzZWxmLCBmaWxlc3lzdGVtLCBmaWxlcywg cGFyYW1zLCB0aW1lb3V0X3NlY29uZHMpOgogICAgICAgICBmaWxlX29ianMgPSBbXQpAQCAtOTks MTcgKzk5LDE5IEBAIGNsYXNzIEZpbGVVcGxvYWRlcihvYmplY3QpOgogCiAgICAgICAgICMgRklY TUU6IFdlIHNob3VsZCB1c2UgdGhlIHNhbWUgdmFyaWFibGUgbmFtZXMgZm9yIHRoZSBmb3JtYWwg YW5kIGFjdHVhbCBwYXJhbWV0ZXJzLgogICAgICAgICBjb250ZW50X3R5cGUsIGRhdGEgPSBfZW5j b2RlX211bHRpcGFydF9mb3JtX2RhdGEoYXR0cnMsIGZpbGVfb2JqcykKLSAgICAgICAgc2VsZi5f dXBsb2FkX2RhdGEoY29udGVudF90eXBlLCBkYXRhKQorICAgICAgICByZXR1cm4gc2VsZi5fdXBs b2FkX2RhdGEoY29udGVudF90eXBlLCBkYXRhKQogCiAgICAgZGVmIF91cGxvYWRfZGF0YShzZWxm LCBjb250ZW50X3R5cGUsIGRhdGEpOgogICAgICAgICBkZWYgY2FsbGJhY2soKToKICAgICAgICAg ICAgIHJlcXVlc3QgPSB1cmxsaWIyLlJlcXVlc3Qoc2VsZi5fdXJsLCBkYXRhLCB7IkNvbnRlbnQt VHlwZSI6IGNvbnRlbnRfdHlwZX0pCi0gICAgICAgICAgICB1cmxsaWIyLnVybG9wZW4ocmVxdWVz dCkKKyAgICAgICAgICAgIHJldHVybiB1cmxsaWIyLnVybG9wZW4ocmVxdWVzdCkKIAogICAgICAg ICBvcmlnX3RpbWVvdXQgPSBzb2NrZXQuZ2V0ZGVmYXVsdHRpbWVvdXQoKQorICAgICAgICByZXNw b25zZSA9IE5vbmUKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgIyBGSVhNRTogV2Ugc2hvdWxk bid0IG11dGF0ZSBnbG9iYWwgc3RhdGljIHN0YXRlLgogICAgICAgICAgICAgc29ja2V0LnNldGRl ZmF1bHR0aW1lb3V0KHNlbGYuX3RpbWVvdXRfc2Vjb25kcykKLSAgICAgICAgICAgIE5ldHdvcmtU cmFuc2FjdGlvbih0aW1lb3V0X3NlY29uZHM9c2VsZi5fdGltZW91dF9zZWNvbmRzKS5ydW4oY2Fs bGJhY2spCisgICAgICAgICAgICByZXNwb25zZSA9IE5ldHdvcmtUcmFuc2FjdGlvbih0aW1lb3V0 X3NlY29uZHM9c2VsZi5fdGltZW91dF9zZWNvbmRzKS5ydW4oY2FsbGJhY2spCiAgICAgICAgIGZp bmFsbHk6CiAgICAgICAgICAgICBzb2NrZXQuc2V0ZGVmYXVsdHRpbWVvdXQob3JpZ190aW1lb3V0 KQorICAgICAgICAgICAgcmV0dXJuIHJlc3BvbnNlCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5w eQkocmV2aXNpb24gMTA1NTQzKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5j ZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTE3NCwxMSArMTc0 LDE4IEBAIGNsYXNzIFBlcmZUZXN0c1J1bm5lcihvYmplY3QpOgogICAgIGRlZiBfdXBsb2FkX2pz b24oc2VsZiwgdGVzdF9yZXN1bHRzX3NlcnZlciwganNvbl9wYXRoLCBmaWxlX3VwbG9hZGVyPUZp bGVVcGxvYWRlcik6CiAgICAgICAgIHVwbG9hZGVyID0gZmlsZV91cGxvYWRlcigiaHR0cHM6Ly8l cy9hcGkvdGVzdC9yZXBvcnQiICUgdGVzdF9yZXN1bHRzX3NlcnZlciwgMTIwKQogICAgICAgICB0 cnk6Ci0gICAgICAgICAgICB1cGxvYWRlci51cGxvYWRfc2luZ2xlX3RleHRfZmlsZShzZWxmLl9o b3N0LmZpbGVzeXN0ZW0sICdhcHBsaWNhdGlvbi9qc29uJywganNvbl9wYXRoKQorICAgICAgICAg ICAgcmVzcG9uc2UgPSB1cGxvYWRlci51cGxvYWRfc2luZ2xlX3RleHRfZmlsZShzZWxmLl9ob3N0 LmZpbGVzeXN0ZW0sICdhcHBsaWNhdGlvbi9qc29uJywganNvbl9wYXRoKQogICAgICAgICBleGNl cHQgRXhjZXB0aW9uLCBlcnJvcjoKICAgICAgICAgICAgIF9sb2cuZXJyb3IoIkZhaWxlZCB0byB1 cGxvYWQgSlNPTiBmaWxlIGluIDEyMHM6ICVzIiAlIGVycm9yKQogICAgICAgICAgICAgcmV0dXJu IEZhbHNlCiAKKyAgICAgICAgcmVzcG9uc2VfYm9keSA9IFtsaW5lLnN0cmlwKCdcbicpIGZvciBs aW5lIGluIHJlc3BvbnNlXQorICAgICAgICBpZiByZXNwb25zZV9ib2R5ICE9IFsnT0snXToKKyAg ICAgICAgICAgIF9sb2cuZXJyb3IoIlVwbG9hZGVkIEpTT04gYnV0IGdvdCBhIGJhZCByZXNwb25z ZToiKQorICAgICAgICAgICAgZm9yIGxpbmUgaW4gcmVzcG9uc2VfYm9keToKKyAgICAgICAgICAg ICAgICBfbG9nLmVycm9yKGxpbmUpCisgICAgICAgICAgICByZXR1cm4gRmFsc2UKKwogICAgICAg ICBzZWxmLl9wcmludGVyLndyaXRlKCJKU09OIGZpbGUgdXBsb2FkZWQuIikKICAgICAgICAgcmV0 dXJuIFRydWUKIApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0 cy9wZXJmdGVzdHNydW5uZXJfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXJfdW5pdHRlc3QucHkJ KHJldmlzaW9uIDEwNTU0MykKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2Vf dGVzdHMvcGVyZnRlc3RzcnVubmVyX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOSwx MiArMjksMTQgQEAKIAogIiIiVW5pdCB0ZXN0cyBmb3IgcnVuX3BlcmZfdGVzdHMuIiIiCiAKK2lt cG9ydCBTdHJpbmdJTwogaW1wb3J0IGpzb24KIGltcG9ydCB1bml0dGVzdAogCiBmcm9tIHdlYmtp dHB5LmNvbW1vbiBpbXBvcnQgYXJyYXlfc3RyZWFtCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0 X21vY2sgaW1wb3J0IE1vY2tIb3N0CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZmlsZXN5 c3RlbV9tb2NrIGltcG9ydCBNb2NrRmlsZVN5c3RlbQorZnJvbSB3ZWJraXRweS5jb21tb24uc3lz dGVtLm91dHB1dGNhcHR1cmUgaW1wb3J0IE91dHB1dENhcHR1cmUKIGZyb20gd2Via2l0cHkubGF5 b3V0X3Rlc3RzLnBvcnQuZHJpdmVyIGltcG9ydCBEcml2ZXJJbnB1dCwgRHJpdmVyT3V0cHV0CiBm cm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0LnRlc3QgaW1wb3J0IFRlc3RQb3J0CiBmcm9t IHdlYmtpdHB5LmxheW91dF90ZXN0cy52aWV3cyBpbXBvcnQgcHJpbnRpbmcKQEAgLTI0MCwxMSAr MjQyLDEyIEBAIG1heCAxMTIwCiAKICAgICBkZWYgdGVzdF91cGxvYWRfanNvbihzZWxmKToKICAg ICAgICAgcmVndWxhcl9vdXRwdXQgPSBhcnJheV9zdHJlYW0uQXJyYXlTdHJlYW0oKQotICAgICAg ICBydW5uZXIgPSBzZWxmLmNyZWF0ZV9ydW5uZXIoYnVpbGRib3Rfb3V0cHV0PXJlZ3VsYXJfb3V0 cHV0KQorICAgICAgICBydW5uZXIgPSBzZWxmLmNyZWF0ZV9ydW5uZXIocmVndWxhcl9vdXRwdXQ9 cmVndWxhcl9vdXRwdXQpCiAgICAgICAgIHJ1bm5lci5faG9zdC5maWxlc3lzdGVtLmZpbGVzWycv bW9jay1jaGVja291dC9zb21lLmpzb24nXSA9ICdzb21lIGNvbnRlbnQnCiAKICAgICAgICAgY2Fs bGVkID0gW10KICAgICAgICAgdXBsb2FkX3NpbmdsZV90ZXh0X2ZpbGVfdGhyb3dzID0gRmFsc2UK KyAgICAgICAgdXBsb2FkX3NpbmdsZV90ZXh0X2ZpbGVfcmV0dXJuX3ZhbHVlID0gU3RyaW5nSU8u U3RyaW5nSU8oJ09LJykKIAogICAgICAgICBjbGFzcyBNb2NrRmlsZVVwbG9hZGVyOgogICAgICAg ICAgICAgZGVmIF9faW5pdF9fKG1vY2ssIHVybCwgdGltZW91dCk6CkBAIC0yNTksMTAgKzI2Miwx OCBAQCBtYXggMTEyMAogICAgICAgICAgICAgICAgIGNhbGxlZC5hcHBlbmQoJ3VwbG9hZF9zaW5n bGVfdGV4dF9maWxlJykKICAgICAgICAgICAgICAgICBpZiB1cGxvYWRfc2luZ2xlX3RleHRfZmls ZV90aHJvd3M6CiAgICAgICAgICAgICAgICAgICAgIHJhaXNlICJTb21lIGV4Y2VwdGlvbiIKKyAg ICAgICAgICAgICAgICByZXR1cm4gdXBsb2FkX3NpbmdsZV90ZXh0X2ZpbGVfcmV0dXJuX3ZhbHVl CiAKICAgICAgICAgcnVubmVyLl91cGxvYWRfanNvbignc29tZS5ob3N0JywgJ3NvbWUuanNvbics IE1vY2tGaWxlVXBsb2FkZXIpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY2FsbGVkLCBbJ0Zp bGVVcGxvYWRlcicsICd1cGxvYWRfc2luZ2xlX3RleHRfZmlsZSddKQogCisgICAgICAgIG91dHB1 dCA9IE91dHB1dENhcHR1cmUoKQorICAgICAgICBvdXRwdXQuY2FwdHVyZV9vdXRwdXQoKQorICAg ICAgICB1cGxvYWRfc2luZ2xlX3RleHRfZmlsZV9yZXR1cm5fdmFsdWUgPSBTdHJpbmdJTy5TdHJp bmdJTygnU29tZSBlcnJvcicpCisgICAgICAgIHJ1bm5lci5fdXBsb2FkX2pzb24oJ3NvbWUuaG9z dCcsICdzb21lLmpzb24nLCBNb2NrRmlsZVVwbG9hZGVyKQorICAgICAgICBfLCBfLCBsb2dzID0g b3V0cHV0LnJlc3RvcmVfb3V0cHV0KCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsb2dzLCAn VXBsb2FkZWQgSlNPTiBidXQgZ290IGEgYmFkIHJlc3BvbnNlOlxuU29tZSBlcnJvclxuJykKKwog ICAgICAgICAjIFRocm93aW5nIGFuIGV4Y2VwdGlvbiB1cGxvYWRfc2luZ2xlX3RleHRfZmlsZSBz aG91bGRuJ3QgYmxvdyB1cCBfdXBsb2FkX2pzb24KICAgICAgICAgY2FsbGVkID0gW10KICAgICAg ICAgdXBsb2FkX3NpbmdsZV90ZXh0X2ZpbGVfdGhyb3dzID0gVHJ1ZQo=