83294 2012-04-05 10:38:54 -0700 perf-o-matic should include unit in runs JSON responses 2012-04-05 12:32:31 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 82852 77037 1 rniwa rniwa abarth eric haraken morrita oldest_to_newest 596692 0 rniwa 2012-04-05 10:38:54 -0700 perf-o-matic should include unit in runs JSON responses 596695 1 135856 rniwa 2012-04-05 10:44:21 -0700 Created attachment 135856 Patch 596699 2 rniwa 2012-04-05 10:45:29 -0700 Once we land this & push it to the production, we can show units on perf-o-matic :) 596701 3 rniwa 2012-04-05 10:47:00 -0700 Note that I've already made the frontend change upstream, and rhelmer has pulled my changes: https://github.com/mozilla/graphs/commit/ba7b2b21f5b001f8513aca8e613f6e0920d8fff3 https://github.com/mozilla/graphs/commit/c1fc48d40134b25876a7664eadab342f36a33b3a 596703 4 135856 tony 2012-04-05 10:48:04 -0700 Comment on attachment 135856 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135856&action=review > Websites/webkit-perf.appspot.com/models.py:452 > + return '{"test_runs": [%s], "averages": {%s}, "min": %s, "max": %s, "unit": %s, "date_range": null, "stat": "ok"}' % (self.json_runs, > + self.json_averages, str(self.json_min) if self.json_min else 'null', str(self.json_max) if self.json_max else 'null', Nit: You might want to start naming the strings. E.g., %(test_runs)s .. %(averages)s .. etc. That might make it a bit easier to match up the string substitutions. 596709 5 135856 rniwa 2012-04-05 10:55:08 -0700 Comment on attachment 135856 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135856&action=review >> Websites/webkit-perf.appspot.com/models.py:452 >> + self.json_averages, str(self.json_min) if self.json_min else 'null', str(self.json_max) if self.json_max else 'null', > > Nit: You might want to start naming the strings. E.g., %(test_runs)s .. %(averages)s .. etc. That might make it a bit easier to match up the string substitutions. Yeah I guess. But then I'll have to repeat that in the string and in the dictionary and will make the code much more verbose. I could make '"min": %s, "max": %s, "unit": %s, "date_range": null, "stat": "ok"' a dictionary and just call json.dumps instead. (Can't call dumps on test_runs and json_averages since they aren't real json. On the other hand, that ends up requiring some string manipulating of { and }. Not sure if that's desirable :\ 596801 6 rniwa 2012-04-05 12:32:31 -0700 Committed r113356: <http://trac.webkit.org/changeset/113356> 135856 2012-04-05 10:44:21 -0700 2012-04-05 10:55:08 -0700 Patch bug-83294-20120405104419.patch text/plain 6349 rniwa SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDExMzMz NCkKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA0 LTA1ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIHBlcmYtby1t YXRpYyBzaG91bGQgaW5jbHVkZSB1bml0IGluIHJ1bnMgSlNPTiByZXNwb25zZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzMjk0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBhIGZvbGxvdyB1 cCB0byByMTEyODI5LiBSZXBvcnQgdGhlIHVuaXQgaW4gL2FwaS90ZXN0L3J1bnMgc28gdGhhdCB0 aGUgZnJvbnRlbmQgY2FuIHNob3cgaXQuCisgICAgICAgIEZpeGVkIGEgYnVnIGluIFRlc3QudXBk YXRlX29yX2luc2VydCB0aGF0IGl0IGRpZG4ndCBzdG9yZSB0aGUgdW5pdCB3aGVuIGl0IGZpcnN0 IGNyZWF0ZWQgdGhlIFRlc3Qgb2JqZWN0LgorCisgICAgICAgIEFsc28gaW5jcmVtZW50IHBlcmYt by1tYXRpYydzIHZlcnNpb24gdG8gMTguCisKKyAgICAgICAgKiBXZWJzaXRlcy93ZWJraXQtcGVy Zi5hcHBzcG90LmNvbS9hcHAueWFtbDogSW5jcmVtZW50ZWQgdGhlIHZlcnNpb24uCisgICAgICAg ICogV2Vic2l0ZXMvd2Via2l0LXBlcmYuYXBwc3BvdC5jb20vbW9kZWxzLnB5OgorICAgICAgICAo VGVzdC51cGRhdGVfb3JfaW5zZXJ0LmV4ZWN1dGUpOiBTdG9yZSB1bml0IHdoZW4gY3JlYXRpbmcg YSB0ZXN0LgorICAgICAgICAoUnVucy50b19qc29uKTogSW5jbHVkZSB1bml0LgorICAgICAgICAq IFdlYnNpdGVzL3dlYmtpdC1wZXJmLmFwcHNwb3QuY29tL21vZGVsc191bml0dGVzdC5weTogQWRk ZWQgdGVzdHMuCisgICAgICAgIChUZXN0TW9kZWxUZXN0cy50ZXN0X3VwZGF0ZV9vcl9pbnNlcnRf d2l0aF91bml0KToKKyAgICAgICAgKFJ1bnNUZXN0LnRlc3RfdG9fanNvbl93aXRob3V0X3Jlc3Vs dHMpOgorICAgICAgICAoUnVuc1Rlc3QudGVzdF90b19qc29uX3dpdGhfcmVzdWx0cyk6CisgICAg ICAgIChSdW5zVGVzdC50ZXN0X3RvX2pzb25fd2l0aF91bml0KToKKwogMjAxMi0wMy0xNCAgQW50 b25pbyBHb21lcyAgPGFnb21lc0ByaW0uY29tPgogCiAgICAgICAgIEV4dGVuZCBIaXRUZXN0UmVz dWx0IHRvIHN1cHBvcnQgbm90ICJkaXNjYXJkaW5nIiBzaGFkb3cgY29udGVudCBpbiBmYXZvciBv ZiBpdHMgRE9NIGFuY2VzdG9yCkluZGV4OiBXZWJzaXRlcy93ZWJraXQtcGVyZi5hcHBzcG90LmNv bS9hcHAueWFtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy93ZWJraXQtcGVyZi5hcHBzcG90LmNv bS9hcHAueWFtbAkocmV2aXNpb24gMTEzMDgyKQorKysgV2Vic2l0ZXMvd2Via2l0LXBlcmYuYXBw c3BvdC5jb20vYXBwLnlhbWwJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiBhcHBsaWNh dGlvbjogd2Via2l0LXBlcmYKLXZlcnNpb246IDE3Cit2ZXJzaW9uOiAxOAogcnVudGltZTogcHl0 aG9uMjcKIGFwaV92ZXJzaW9uOiAxCiB0aHJlYWRzYWZlOiBmYWxzZQpJbmRleDogV2Vic2l0ZXMv d2Via2l0LXBlcmYuYXBwc3BvdC5jb20vbW9kZWxzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYnNpdGVz L3dlYmtpdC1wZXJmLmFwcHNwb3QuY29tL21vZGVscy5weQkocmV2aXNpb24gMTEzMDgyKQorKysg V2Vic2l0ZXMvd2Via2l0LXBlcmYuYXBwc3BvdC5jb20vbW9kZWxzLnB5CSh3b3JraW5nIGNvcHkp CkBAIC0xNjcsNyArMTY3LDcgQEAgY2xhc3MgVGVzdChkYi5Nb2RlbCk6CiAgICAgICAgICAgICAg ICAgZXhpc3RpbmdfdGVzdFswXSA9IHRlc3QKICAgICAgICAgICAgICAgICByZXR1cm4gTm9uZQog Ci0gICAgICAgICAgICB0ZXN0ID0gVGVzdChpZD1pZCwgbmFtZT10ZXN0X25hbWUsIGtleV9uYW1l PXRlc3RfbmFtZSwgYnJhbmNoZXM9W2JyYW5jaC5rZXkoKV0sIHBsYXRmb3Jtcz1bcGxhdGZvcm0u a2V5KCldKQorICAgICAgICAgICAgdGVzdCA9IFRlc3QoaWQ9aWQsIG5hbWU9dGVzdF9uYW1lLCBr ZXlfbmFtZT10ZXN0X25hbWUsIHVuaXQ9dW5pdCwgYnJhbmNoZXM9W2JyYW5jaC5rZXkoKV0sIHBs YXRmb3Jtcz1bcGxhdGZvcm0ua2V5KCldKQogICAgICAgICAgICAgdGVzdC5wdXQoKQogICAgICAg ICAgICAgcmV0dXJuIHRlc3QKIApAQCAtNDQ4LDggKzQ0OCw5IEBAIGNsYXNzIFJ1bnMoZGIuTW9k ZWwpOgogCiAgICAgZGVmIHRvX2pzb24oc2VsZik6CiAgICAgICAgICMgZGF0ZV9yYW5nZSBpcyBu ZXZlciB1c2VkIGJ5IGNvbW1vbi5qcy4KLSAgICAgICAgcmV0dXJuICd7InRlc3RfcnVucyI6IFsl c10sICJhdmVyYWdlcyI6IHslc30sICJtaW4iOiAlcywgIm1heCI6ICVzLCAiZGF0ZV9yYW5nZSI6 IG51bGwsICJzdGF0IjogIm9rIn0nICUgKHNlbGYuanNvbl9ydW5zLAotICAgICAgICAgICAgc2Vs Zi5qc29uX2F2ZXJhZ2VzLCBzdHIoc2VsZi5qc29uX21pbikgaWYgc2VsZi5qc29uX21pbiBlbHNl ICdudWxsJywgc3RyKHNlbGYuanNvbl9tYXgpIGlmIHNlbGYuanNvbl9tYXggZWxzZSAnbnVsbCcp CisgICAgICAgIHJldHVybiAneyJ0ZXN0X3J1bnMiOiBbJXNdLCAiYXZlcmFnZXMiOiB7JXN9LCAi bWluIjogJXMsICJtYXgiOiAlcywgInVuaXQiOiAlcywgImRhdGVfcmFuZ2UiOiBudWxsLCAic3Rh dCI6ICJvayJ9JyAlIChzZWxmLmpzb25fcnVucywKKyAgICAgICAgICAgIHNlbGYuanNvbl9hdmVy YWdlcywgc3RyKHNlbGYuanNvbl9taW4pIGlmIHNlbGYuanNvbl9taW4gZWxzZSAnbnVsbCcsIHN0 cihzZWxmLmpzb25fbWF4KSBpZiBzZWxmLmpzb25fbWF4IGVsc2UgJ251bGwnLAorICAgICAgICAg ICAgJyIlcyInICUgc2VsZi50ZXN0LnVuaXQgaWYgc2VsZi50ZXN0LnVuaXQgZWxzZSAnbnVsbCcp CiAKICAgICBkZWYgY2hhcnRfcGFyYW1zKHNlbGYsIGRpc3BsYXlfZGF5cywgbm93PWRhdGV0aW1l Lm5vdygpLnJlcGxhY2UoaG91cj0xMiwgbWludXRlPTAsIHNlY29uZD0wLCBtaWNyb3NlY29uZD0w KSk6CiAgICAgICAgIGNoYXJ0X2RhdGFfeCA9IFtdCkluZGV4OiBXZWJzaXRlcy93ZWJraXQtcGVy Zi5hcHBzcG90LmNvbS9tb2RlbHNfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vic2l0ZXMv d2Via2l0LXBlcmYuYXBwc3BvdC5jb20vbW9kZWxzX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAxMTMw ODIpCisrKyBXZWJzaXRlcy93ZWJraXQtcGVyZi5hcHBzcG90LmNvbS9tb2RlbHNfdW5pdHRlc3Qu cHkJKHdvcmtpbmcgY29weSkKQEAgLTI2OCw2ICsyNjgsMTMgQEAgY2xhc3MgVGVzdE1vZGVsVGVz dHMoRGF0YVN0b3JlVGVzdHNCYXNlKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHRlc3QudW5p dCwgTm9uZSkKICAgICAgICAgc2VsZi5hc3NlcnRPbmx5SW5zdGFuY2UodGVzdCkKIAorICAgIGRl ZiB0ZXN0X3VwZGF0ZV9vcl9pbnNlcnRfd2l0aF91bml0KHNlbGYpOgorICAgICAgICBicmFuY2gg PSBCcmFuY2guY3JlYXRlX2lmX3Bvc3NpYmxlKCdzb21lLWJyYW5jaCcsICdTb21lIEJyYW5jaCcp CisgICAgICAgIHBsYXRmb3JtID0gUGxhdGZvcm0uY3JlYXRlX2lmX3Bvc3NpYmxlKCdzb21lLXBs YXRmb3JtJywgJ1NvbWUgUGxhdGZvcm0nKQorICAgICAgICB0ZXN0ID0gVGVzdC51cGRhdGVfb3Jf aW5zZXJ0KCdzb21lLXRlc3QnLCBicmFuY2gsIHBsYXRmb3JtLCAncnVucy9zJykKKyAgICAgICAg c2VsZi5hc3NlcnRPbmx5SW5zdGFuY2UodGVzdCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbFVu b3JkZXJlZExpc3QodGVzdC51bml0LCAncnVucy9zJykKKwogICAgIGRlZiB0ZXN0X3VwZGF0ZV9v cl9pbnNlcnRfdG9fdXBkYXRlKHNlbGYpOgogICAgICAgICBicmFuY2ggPSBCcmFuY2guY3JlYXRl X2lmX3Bvc3NpYmxlKCdzb21lLWJyYW5jaCcsICdTb21lIEJyYW5jaCcpCiAgICAgICAgIHBsYXRm b3JtID0gUGxhdGZvcm0uY3JlYXRlX2lmX3Bvc3NpYmxlKCdzb21lLXBsYXRmb3JtJywgJ1NvbWUg UGxhdGZvcm0nKQpAQCAtNjYwLDYgKzY2Nyw3IEBAIGNsYXNzIFJ1bnNUZXN0KERhdGFTdG9yZVRl c3RzQmFzZSk6CiAgICAgICAgICAgICAnYXZlcmFnZXMnOiB7fSwKICAgICAgICAgICAgICdtaW4n OiBOb25lLAogICAgICAgICAgICAgJ21heCc6IE5vbmUsCisgICAgICAgICAgICAndW5pdCc6IE5v bmUsCiAgICAgICAgICAgICAnZGF0ZV9yYW5nZSc6IE5vbmUsCiAgICAgICAgICAgICAnc3RhdCc6 ICdvayd9KQogCkBAIC02NzEsMTAgKzY3OSwxMSBAQCBjbGFzcyBSdW5zVGVzdChEYXRhU3RvcmVU ZXN0c0Jhc2UpOgogICAgICAgICBidWlsZHMsIHJlc3VsdHMgPSBzZWxmLl9jcmVhdGVfcmVzdWx0 cyhzb21lX2JyYW5jaCwgc29tZV9wbGF0Zm9ybSwgc29tZV9idWlsZGVyLCAnc29tZS10ZXN0Jywg WzUwLjAsIDUxLjAsIDUyLjAsIDQ5LjAsIDQ4LjBdKQogCiAgICAgICAgIHZhbHVlID0ganNvbi5s b2FkcyhSdW5zLnVwZGF0ZV9vcl9pbnNlcnQoc29tZV9icmFuY2gsIHNvbWVfcGxhdGZvcm0sIHNv bWVfdGVzdCkudG9fanNvbigpKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsVW5vcmRlcmVkTGlz dCh2YWx1ZS5rZXlzKCksIFsndGVzdF9ydW5zJywgJ2F2ZXJhZ2VzJywgJ21pbicsICdtYXgnLCAn ZGF0ZV9yYW5nZScsICdzdGF0J10pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxVbm9yZGVyZWRM aXN0KHZhbHVlLmtleXMoKSwgWyd0ZXN0X3J1bnMnLCAnYXZlcmFnZXMnLCAnbWluJywgJ21heCcs ICd1bml0JywgJ2RhdGVfcmFuZ2UnLCAnc3RhdCddKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFs KHZhbHVlWydzdGF0J10sICdvaycpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwodmFsdWVbJ21p biddLCA0OC4wKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHZhbHVlWydtYXgnXSwgNTIuMCkK KyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh2YWx1ZVsndW5pdCddLCBOb25lKQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKHZhbHVlWydkYXRlX3JhbmdlJ10sIE5vbmUpICAjIGRhdGVfcmFuZ2Ug aXMgbmV2ZXIgZ2l2ZW4KIAogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxlbih2YWx1ZVsndGVz dF9ydW5zJ10pLCBsZW4ocmVzdWx0cykpCkBAIC02ODgsNiArNjk3LDE2IEBAIGNsYXNzIFJ1bnNU ZXN0KERhdGFTdG9yZVRlc3RzQmFzZSk6CiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJ1 bls2XSwgc29tZV9idWlsZGVyLmtleSgpLmlkKCkpCiAgICAgICAgICAgICBzZWxmLmFzc2VydEVx dWFsKHJ1bls3XSwgTm9uZSkgICMgU3RhdGlzdGljcwogCisgICAgZGVmIHRlc3RfdG9fanNvbl93 aXRoX3VuaXQoc2VsZik6CisgICAgICAgIHNvbWVfYnJhbmNoID0gQnJhbmNoLmNyZWF0ZV9pZl9w b3NzaWJsZSgnc29tZS1icmFuY2gnLCAnU29tZSBCcmFuY2gnKQorICAgICAgICBzb21lX3BsYXRm b3JtID0gUGxhdGZvcm0uY3JlYXRlX2lmX3Bvc3NpYmxlKCdzb21lLXBsYXRmb3JtJywgJ1NvbWUg UGxhdGZvcm0nKQorICAgICAgICBzb21lX2J1aWxkZXIgPSBCdWlsZGVyLmdldChCdWlsZGVyLmNy ZWF0ZSgnc29tZS1idWlsZGVyJywgJ1NvbWUgQnVpbGRlcicpKQorICAgICAgICBzb21lX3Rlc3Qg PSBUZXN0LnVwZGF0ZV9vcl9pbnNlcnQoJ3NvbWUtdGVzdCcsIHNvbWVfYnJhbmNoLCBzb21lX3Bs YXRmb3JtLCAncnVucy9zJykKKyAgICAgICAgYnVpbGRzLCByZXN1bHRzID0gc2VsZi5fY3JlYXRl X3Jlc3VsdHMoc29tZV9icmFuY2gsIHNvbWVfcGxhdGZvcm0sIHNvbWVfYnVpbGRlciwgJ3NvbWUt dGVzdCcsIFs1MC4wLCA1MS4wLCA1Mi4wLCA0OS4wLCA0OC4wXSkKKworICAgICAgICB2YWx1ZSA9 IGpzb24ubG9hZHMoUnVucy51cGRhdGVfb3JfaW5zZXJ0KHNvbWVfYnJhbmNoLCBzb21lX3BsYXRm b3JtLCBzb21lX3Rlc3QpLnRvX2pzb24oKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh2YWx1 ZVsndW5pdCddLCAncnVucy9zJykKKwogICAgIGRlZiBfYXNzZXJ0X2VudHJ5KHNlbGYsIGVudHJ5 LCBidWlsZCwgcmVzdWx0LCB2YWx1ZSwgc3RhdGlzdGljcz1Ob25lLCBzdXBwbGVtZW50YXJ5X3Jl dmlzaW9ucz1Ob25lKToKICAgICAgICAgZW50cnkgPSBlbnRyeVs6XQogICAgICAgICBlbnRyeVsy XSA9IE5vbmUgICMgdGltZXN0YW1wCg==