82852 2012-04-01 21:19:58 -0700 perf-o-matic should store test results' units 2012-04-05 10:44:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 77037 83294 1 rniwa rniwa abarth bank dpranke haraken morrita ojan webkit.review.bot oldest_to_newest 593157 0 rniwa 2012-04-01 21:19:58 -0700 perf-o-matic should store test results' units 593158 1 135024 rniwa 2012-04-01 21:28:37 -0700 Created attachment 135024 Patch 593159 2 rniwa 2012-04-01 21:31:00 -0700 We don't show units on the frontend yet since I need to make that change in the upstream graph sever code. 593161 3 135024 haraken 2012-04-01 21:42:36 -0700 Comment on attachment 135024 Patch Looks OK. Thank you very much for fixing this. 593162 4 rniwa 2012-04-01 21:43:52 -0700 Thanks for the review! 593164 5 rniwa 2012-04-01 21:48:42 -0700 Committed r112829: <http://trac.webkit.org/changeset/112829> 593248 6 bank 2012-04-02 01:26:29 -0700 It broke 2 webkitpy unittest: FAILURE: webkitpy.performance_tests.perftestsrunner_unittest.MainTest.test_run_test_set_with_json_output -------------------------------------------------------------------------------- Traceback (most recent call last): File "/ramdisk/qt-linux-release/build/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py", line 227, in test_run_test_set_with_json_output "webkit-revision": 5678}) AssertionError: {u'timestamp': 123456789, u'results': {u'group_name:test_name': 42.0, u'Bindings/event-target-wrapper': {u'min': 1471.0, u'max': 1510.0, u'median': 1487.0, u'stdev': 14.460000000000001, u'avg': 1489.05, u'unit': u'ms'}}, u'webkit-revision': 5678} != {'timestamp': 123456789, 'results': {'group_name:test_name': 42, 'Bindings/event-target-wrapper': {'max': 1510, 'avg': 1489.05, 'median': 1487, 'stdev': 14.460000000000001, 'min': 1471}}, 'webkit-revision': 5678} ================================================================================ FAILURE: webkitpy.performance_tests.perftestsrunner_unittest.MainTest.test_run_test_set_with_json_source -------------------------------------------------------------------------------- Traceback (most recent call last): File "/ramdisk/qt-linux-release/build/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py", line 247, in test_run_test_set_with_json_source "key": "value"}) AssertionError: {u'timestamp': 123456789, u'results': {u'group_name:test_name': 42.0, u'Bindings/event-target-wrapper': {u'min': 1471.0, u'max': 1510.0, u'median': 1487.0, u'stdev': 14.460000000000001, u'avg': 1489.05, u'unit': u'ms'}}, u'key': u'value', u'webkit-revision': 5678} != {'timestamp': 123456789, 'results': {'group_name:test_name': 42, 'Bindings/event-target-wrapper': {'max': 1510, 'avg': 1489.05, 'median': 1487, 'stdev': 14.460000000000001, 'min': 1471}}, 'key': 'value', 'webkit-revision': 5678} 593558 7 rniwa 2012-04-02 10:06:30 -0700 I thought I fixed in http://trac.webkit.org/changeset/112836? 135024 2012-04-01 21:28:37 -0700 2012-04-01 21:42:36 -0700 Patch bug-82852-20120401212835.patch text/plain 11846 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyODI0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGFiOTEwYzczZTY2ZDFmMjNhNzAzMTZkNWNiMGYyYWRi NDNlMDhlOS4uZWVlOWI1MDQxNmRlNTZjZTliNThhZDM0ZmM2YzQ0M2Y2MGMyN2M3ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTA0LTAxICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAg ICAgIHBlcmYtby1tYXRpYyBzaG91bGQgc3RvcmUgdGVzdCByZXN1bHRzJyB1bml0cworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI4NTIKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbmNsdWRlIHVuaXRzIGlu IHRoZSByZXN1bHRzIEpTT04uCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1h bmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5weToKKyAgICAgICAgKFBlcmZUZXN0c1J1bm5lci5f cHJvY2Vzc19jaHJvbWl1bV9zdHlsZV90ZXN0X3Jlc3VsdCk6CisgICAgICAgIChQZXJmVGVzdHNS dW5uZXIuX3Byb2Nlc3NfcGFyc2VyX3Rlc3RfcmVzdWx0KToKKwogMjAxMi0wNC0wMSAgVG9ueSBU c2V1bmcgIDx0c2V1bmdAYXBwbGUuY29tPgogCiAgICAgICAgIENvbXBvc2l0ZSBGb250IFJlZmVy ZW5jZXMgaXMgYSBuZXcgZXN0YWJsaXNoZWQgc3RhbmRhcmQgKElTTy9JRUMgMTQ0OTYtMjg6MjAx MikgZm9yIHNwZWNpZnlpbmcKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVy Zm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkKaW5kZXggZGIxNWViMzhhYjdm MTk4NTBhZTZmODk5NDI1ZjMxZWFhNzVjNGQ4MS4uNzliMGMyOTUyNjE1OTUyMTQ2OWRmNGYwMGI5 NjhiYWFjZWQ3NTc5NiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3Jt YW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkKQEAgLTI1MCw2ICsyNTAsNyBA QCBjbGFzcyBQZXJmVGVzdHNSdW5uZXIob2JqZWN0KToKICAgICAgICAgZm9yIGxpbmUgaW4gcmUu c3BsaXQoJ1xuJywgb3V0cHV0LnRleHQpOgogICAgICAgICAgICAgcmVzdWx0TGluZSA9IHNlbGYu X2luc3BlY3Rvcl9yZXN1bHRfcmVnZXgubWF0Y2gobGluZSkKICAgICAgICAgICAgIGlmIHJlc3Vs dExpbmU6CisgICAgICAgICAgICAgICAgIyBGSVhNRTogU3RvcmUgdGhlIHVuaXQKICAgICAgICAg ICAgICAgICBzZWxmLl9yZXN1bHRzW3Jlc3VsdExpbmUuZ3JvdXAoJ25hbWUnKS5yZXBsYWNlKCcg JywgJycpXSA9IGZsb2F0KHJlc3VsdExpbmUuZ3JvdXAoJ3ZhbHVlJykpCiAgICAgICAgICAgICAg ICAgc2VsZi5fYnVpbGRib3Rfb3V0cHV0LndyaXRlKCIlc1xuIiAlIGxpbmUpCiAgICAgICAgICAg ICAgICAgZ290X2FfcmVzdWx0ID0gVHJ1ZQpAQCAtMjg2LDYgKzI4Nyw3IEBAIGNsYXNzIFBlcmZU ZXN0c1J1bm5lcihvYmplY3QpOgogICAgICAgICBrZXlzID0gWydhdmcnLCAnbWVkaWFuJywgJ3N0 ZGV2JywgJ21pbicsICdtYXgnXQogICAgICAgICBzY29yZV9yZWdleCA9IHJlLmNvbXBpbGUocide KD9QPGtleT4nICsgcid8Jy5qb2luKGtleXMpICsgcicpXHMrKD9QPHZhbHVlPlswLTlcLl0rKVxz Kig/UDx1bml0Pi4qKScpCiAgICAgICAgIHVuaXQgPSAibXMiCisKICAgICAgICAgZm9yIGxpbmUg aW4gcmUuc3BsaXQoJ1xuJywgb3V0cHV0LnRleHQpOgogICAgICAgICAgICAgc2NvcmUgPSBzY29y ZV9yZWdleC5tYXRjaChsaW5lKQogICAgICAgICAgICAgaWYgc2NvcmU6CkBAIC0zMDAsNiArMzAy LDkgQEAgY2xhc3MgUGVyZlRlc3RzUnVubmVyKG9iamVjdCk6CiAKICAgICAgICAgaWYgdGVzdF9m YWlsZWQgb3Igc2V0KGtleXMpICE9IHNldChyZXN1bHRzLmtleXMoKSk6CiAgICAgICAgICAgICBy ZXR1cm4gVHJ1ZQorCisgICAgICAgIHJlc3VsdHNbJ3VuaXQnXSA9IHVuaXQKKwogICAgICAgICBz ZWxmLl9yZXN1bHRzW2ZpbGVzeXN0ZW0uam9pbihjYXRlZ29yeSwgdGVzdF9uYW1lKS5yZXBsYWNl KCdcXCcsICcvJyldID0gcmVzdWx0cwogICAgICAgICBzZWxmLl9idWlsZGJvdF9vdXRwdXQud3Jp dGUoJ1JFU1VMVCAlczogJXM9ICVzICVzXG4nICUgKGNhdGVnb3J5LCB0ZXN0X25hbWUsIHJlc3Vs dHNbJ2F2ZyddLCB1bml0KSkKICAgICAgICAgc2VsZi5fYnVpbGRib3Rfb3V0cHV0LndyaXRlKCcs ICcuam9pbihbJyVzPSAlcyAlcycgJSAoa2V5LCByZXN1bHRzW2tleV0sIHVuaXQpIGZvciBrZXkg aW4ga2V5c1sxOl1dKSArICdcbicpCmRpZmYgLS1naXQgYS9XZWJzaXRlcy93ZWJraXQtcGVyZi5h cHBzcG90LmNvbS9tb2RlbHMucHkgYi9XZWJzaXRlcy93ZWJraXQtcGVyZi5hcHBzcG90LmNvbS9t b2RlbHMucHkKaW5kZXggOWFkNWQxZWY5ZGQxZWFmYjkzOGNmMzY1YTEwYzc0Y2NjMTBkMzg3YS4u OWMxZmZlYjQwOTA1MWI3ZTYzMDYxOWUxZWI5OWIzOTkwMDU0NjQ0YyAxMDA2NDQKLS0tIGEvV2Vi c2l0ZXMvd2Via2l0LXBlcmYuYXBwc3BvdC5jb20vbW9kZWxzLnB5CisrKyBiL1dlYnNpdGVzL3dl YmtpdC1wZXJmLmFwcHNwb3QuY29tL21vZGVscy5weQpAQCAtMTQ4LDEwICsxNDgsMTEgQEAgY2xh c3MgVGVzdChkYi5Nb2RlbCk6CiAgICAgIyBvbmUgcGxhdGZvcm0gYnV0IG9ubHkgb24gc29tZSBi cmFuY2ggYW5kIHZpY2UgdmVyc2EuCiAgICAgYnJhbmNoZXMgPSBkYi5MaXN0UHJvcGVydHkoZGIu S2V5KQogICAgIHBsYXRmb3JtcyA9IGRiLkxpc3RQcm9wZXJ0eShkYi5LZXkpCisgICAgdW5pdCA9 IGRiLlN0cmluZ1Byb3BlcnR5KCkKICAgICBoaWRkZW4gPSBkYi5Cb29sZWFuUHJvcGVydHkoKQog CiAgICAgQHN0YXRpY21ldGhvZAotICAgIGRlZiB1cGRhdGVfb3JfaW5zZXJ0KHRlc3RfbmFtZSwg YnJhbmNoLCBwbGF0Zm9ybSk6CisgICAgZGVmIHVwZGF0ZV9vcl9pbnNlcnQodGVzdF9uYW1lLCBi cmFuY2gsIHBsYXRmb3JtLCB1bml0PU5vbmUpOgogICAgICAgICBleGlzdGluZ190ZXN0ID0gW05v bmVdCiAKICAgICAgICAgZGVmIGV4ZWN1dGUoaWQpOgpAQCAtMTYxLDYgKzE2Miw3IEBAIGNsYXNz IFRlc3QoZGIuTW9kZWwpOgogICAgICAgICAgICAgICAgICAgICB0ZXN0LmJyYW5jaGVzLmFwcGVu ZChicmFuY2gua2V5KCkpCiAgICAgICAgICAgICAgICAgaWYgcGxhdGZvcm0ua2V5KCkgbm90IGlu IHRlc3QucGxhdGZvcm1zOgogICAgICAgICAgICAgICAgICAgICB0ZXN0LnBsYXRmb3Jtcy5hcHBl bmQocGxhdGZvcm0ua2V5KCkpCisgICAgICAgICAgICAgICAgdGVzdC51bml0ID0gdW5pdAogICAg ICAgICAgICAgICAgIHRlc3QucHV0KCkKICAgICAgICAgICAgICAgICBleGlzdGluZ190ZXN0WzBd ID0gdGVzdAogICAgICAgICAgICAgICAgIHJldHVybiBOb25lCkBAIC0yNTIsNiArMjU0LDMzIEBA IGNsYXNzIFJlcG9ydExvZyhkYi5Nb2RlbCk6CiAgICAgZGVmIHJlc3VsdHMoc2VsZik6CiAgICAg ICAgIHJldHVybiBzZWxmLmdldF92YWx1ZSgncmVzdWx0cycpCiAKKyAgICBkZWYgcmVzdWx0c19h cmVfd2VsbF9mb3JtZWQoc2VsZik6CisKKyAgICAgICAgZGVmIF9pc19mbG9hdF9jb252ZXJ0aWJs ZSh2YWx1ZSk6CisgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAgICAgZmxvYXQodmFsdWUp CisgICAgICAgICAgICAgICAgcmV0dXJuIFRydWUKKyAgICAgICAgICAgIGV4Y2VwdCBUeXBlRXJy b3I6CisgICAgICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisgICAgICAgICAgICBleGNlcHQgVmFs dWVFcnJvcjoKKyAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UKKworICAgICAgICBpZiBub3Qg aXNpbnN0YW5jZShzZWxmLnJlc3VsdHMoKSwgZGljdCk6CisgICAgICAgICAgICByZXR1cm4gRmFs c2UKKworICAgICAgICBmb3IgdGVzdFJlc3VsdCBpbiBzZWxmLnJlc3VsdHMoKS52YWx1ZXMoKToK KyAgICAgICAgICAgIGlmIGlzaW5zdGFuY2UodGVzdFJlc3VsdCwgZGljdCk6CisgICAgICAgICAg ICAgICAgZm9yIGtleSwgdmFsdWUgaW4gdGVzdFJlc3VsdC5pdGVyaXRlbXMoKToKKyAgICAgICAg ICAgICAgICAgICAgaWYga2V5ICE9ICJ1bml0IiBhbmQgbm90IF9pc19mbG9hdF9jb252ZXJ0aWJs ZSh2YWx1ZSk6CisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UKKyAgICAgICAg ICAgICAgICBpZiAnYXZnJyBub3QgaW4gdGVzdFJlc3VsdDoKKyAgICAgICAgICAgICAgICAgICAg cmV0dXJuIEZhbHNlCisgICAgICAgICAgICAgICAgY29udGludWUKKyAgICAgICAgICAgIGlmIG5v dCBfaXNfZmxvYXRfY29udmVydGlibGUodGVzdFJlc3VsdCk6CisgICAgICAgICAgICAgICAgcmV0 dXJuIEZhbHNlCisKKyAgICAgICAgcmV0dXJuIFRydWUKKwogICAgIGRlZiBidWlsZGVyKHNlbGYp OgogICAgICAgICByZXR1cm4gc2VsZi5fbW9kZWxfYnlfa2V5X25hbWVfaW5fcGF5bG9hZChCdWls ZGVyLCAnYnVpbGRlci1uYW1lJykKIApkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvd2Via2l0LXBlcmYu YXBwc3BvdC5jb20vbW9kZWxzX3VuaXR0ZXN0LnB5IGIvV2Vic2l0ZXMvd2Via2l0LXBlcmYuYXBw c3BvdC5jb20vbW9kZWxzX3VuaXR0ZXN0LnB5CmluZGV4IGZhNDg1NmI3NDVlM2ViOTYwMDAwYmJk Y2E4ZDNiOWRiNWExYWQyOTguLmNjMjk4ZTVhZGM2NGRlMDU5ODk3NzJhNjA2ZjgyNDAyZWNkMWU1 YzYgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3dlYmtpdC1wZXJmLmFwcHNwb3QuY29tL21vZGVsc191 bml0dGVzdC5weQorKysgYi9XZWJzaXRlcy93ZWJraXQtcGVyZi5hcHBzcG90LmNvbS9tb2RlbHNf dW5pdHRlc3QucHkKQEAgLTI2NSw2ICsyNjUsNyBAQCBjbGFzcyBUZXN0TW9kZWxUZXN0cyhEYXRh U3RvcmVUZXN0c0Jhc2UpOgogICAgICAgICBzZWxmLmFzc2VydFRydWUodGVzdCkKICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbCh0ZXN0LmJyYW5jaGVzLCBbYnJhbmNoLmtleSgpXSkKICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbCh0ZXN0LnBsYXRmb3JtcywgW3BsYXRmb3JtLmtleSgpXSkKKyAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbCh0ZXN0LnVuaXQsIE5vbmUpCiAgICAgICAgIHNlbGYuYXNzZXJ0 T25seUluc3RhbmNlKHRlc3QpCiAKICAgICBkZWYgdGVzdF91cGRhdGVfb3JfaW5zZXJ0X3RvX3Vw ZGF0ZShzZWxmKToKQEAgLTI3NSwxNCArMjc2LDExIEBAIGNsYXNzIFRlc3RNb2RlbFRlc3RzKERh dGFTdG9yZVRlc3RzQmFzZSk6CiAKICAgICAgICAgb3RoZXJfYnJhbmNoID0gQnJhbmNoLmNyZWF0 ZV9pZl9wb3NzaWJsZSgnb3RoZXItYnJhbmNoJywgJ090aGVyIEJyYW5jaCcpCiAgICAgICAgIG90 aGVyX3BsYXRmb3JtID0gUGxhdGZvcm0uY3JlYXRlX2lmX3Bvc3NpYmxlKCdvdGhlci1wbGF0Zm9y bScsICdPdGhlciBQbGF0Zm9ybScpCi0gICAgICAgIHRlc3QgPSBUZXN0LnVwZGF0ZV9vcl9pbnNl cnQoJ3NvbWUtdGVzdCcsIG90aGVyX2JyYW5jaCwgb3RoZXJfcGxhdGZvcm0pCisgICAgICAgIHRl c3QgPSBUZXN0LnVwZGF0ZV9vcl9pbnNlcnQoJ3NvbWUtdGVzdCcsIG90aGVyX2JyYW5jaCwgb3Ro ZXJfcGxhdGZvcm0sICdtcycpCiAgICAgICAgIHNlbGYuYXNzZXJ0T25seUluc3RhbmNlKHRlc3Qp CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxVbm9yZGVyZWRMaXN0KHRlc3QuYnJhbmNoZXMsIFti cmFuY2gua2V5KCksIG90aGVyX2JyYW5jaC5rZXkoKV0pCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWxVbm9yZGVyZWRMaXN0KHRlc3QucGxhdGZvcm1zLCBbcGxhdGZvcm0ua2V5KCksIG90aGVyX3Bs YXRmb3JtLmtleSgpXSkKLQotICAgICAgICB0ZXN0ID0gVGVzdC5nZXQodGVzdC5rZXkoKSkKLSAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbFVub3JkZXJlZExpc3QodGVzdC5icmFuY2hlcywgW2JyYW5j aC5rZXkoKSwgb3RoZXJfYnJhbmNoLmtleSgpXSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbFVu b3JkZXJlZExpc3QodGVzdC5wbGF0Zm9ybXMsIFtwbGF0Zm9ybS5rZXkoKSwgb3RoZXJfcGxhdGZv cm0ua2V5KCldKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsVW5vcmRlcmVkTGlzdCh0ZXN0LnVu aXQsICdtcycpCiAKICAgICBkZWYgdGVzdF9tZXJnZShzZWxmKToKICAgICAgICAgYnJhbmNoLCBw bGF0Zm9ybSwgYnVpbGRlciA9IF9jcmVhdGVfc29tZV9idWlsZGVyKCkKQEAgLTQzMyw2ICs0MzEs MjAgQEAgY2xhc3MgUmVwb3J0TG9nVGVzdHMoRGF0YVN0b3JlVGVzdHNCYXNlKToKICAgICAgICAg bG9nID0gc2VsZi5fY3JlYXRlX2xvZ193aXRoX3BheWxvYWQoJ3sia2V5IjogInZhbHVlIn0nKQog ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxvZy5yZXN1bHRzKCksIE5vbmUpCiAKKyAgICBkZWYg dGVzdF9yZXN1bHRzX2FyZV93ZWxsX2Zvcm1lZChzZWxmKToKKworICAgICAgICBkZWYgYXNzZXJ0 X3Jlc3VsdHNfYXJlX3dlbGxfZm9ybWVkKGpzb24sIGV4cGVjdGVkKToKKyAgICAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwoc2VsZi5fY3JlYXRlX2xvZ193aXRoX3BheWxvYWQoanNvbikucmVzdWx0 c19hcmVfd2VsbF9mb3JtZWQoKSwgZXhwZWN0ZWQpCisKKyAgICAgICAgYXNzZXJ0X3Jlc3VsdHNf YXJlX3dlbGxfZm9ybWVkKCd7InJlc3VsdHMiOiAxMjN9JywgRmFsc2UpCisgICAgICAgIGFzc2Vy dF9yZXN1bHRzX2FyZV93ZWxsX2Zvcm1lZCgneyJyZXN1bHRzIjogeyJ0ZXN0IjogMTIzfX0nLCBU cnVlKQorICAgICAgICBhc3NlcnRfcmVzdWx0c19hcmVfd2VsbF9mb3JtZWQoJ3sicmVzdWx0cyI6 IHsidGVzdCI6IDEyMywgIm90aGVyLXRlc3QiOiA0NTZ9fScsIFRydWUpCisgICAgICAgIGFzc2Vy dF9yZXN1bHRzX2FyZV93ZWxsX2Zvcm1lZCgneyJyZXN1bHRzIjogeyJ0ZXN0IjogMTIzLCAib3Ro ZXItdGVzdCI6IDQ1NiwgImJhZC10ZXN0IjogImhpIn19JywgRmFsc2UpCisgICAgICAgIGFzc2Vy dF9yZXN1bHRzX2FyZV93ZWxsX2Zvcm1lZCgneyJyZXN1bHRzIjogeyJ0ZXN0IjogeyJhdmciOiA0 NTZ9fX0nLCBUcnVlKQorICAgICAgICBhc3NlcnRfcmVzdWx0c19hcmVfd2VsbF9mb3JtZWQoJ3si cmVzdWx0cyI6IHsidGVzdCI6IHsiYXZnIjogNDU2LCAibWVkaWFuIjogImhlbGxvIn19fScsIEZh bHNlKQorICAgICAgICBhc3NlcnRfcmVzdWx0c19hcmVfd2VsbF9mb3JtZWQoJ3sicmVzdWx0cyI6 IHsidGVzdCI6IHsiYXZnIjogNDU2LCAibWVkaWFuIjogNzg5fX19JywgVHJ1ZSkKKyAgICAgICAg YXNzZXJ0X3Jlc3VsdHNfYXJlX3dlbGxfZm9ybWVkKCd7InJlc3VsdHMiOiB7InRlc3QiOiB7ImF2 ZyI6IDQ1NiwgInVuaXQiOiAiYnl0ZXMifX19JywgVHJ1ZSkKKwogICAgIGRlZiB0ZXN0X2J1aWxk ZXIoc2VsZik6CiAgICAgICAgIGxvZyA9IHNlbGYuX2NyZWF0ZV9sb2dfd2l0aF9wYXlsb2FkKCd7 ImtleSI6ICJ2YWx1ZSJ9JykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsb2cuYnVpbGRlcigp LCBOb25lKQpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvd2Via2l0LXBlcmYuYXBwc3BvdC5jb20vcmVw b3J0X2hhbmRsZXIucHkgYi9XZWJzaXRlcy93ZWJraXQtcGVyZi5hcHBzcG90LmNvbS9yZXBvcnRf aGFuZGxlci5weQppbmRleCA5NjE4ODc1ZjkzMTczN2Y1MWJmMjdjYjZlYjllODQwZDYwYTRiOWMz Li4wZjFhZGIxODVkZDI3ZWUzM2ZiOWMxNjA2ODFjY2VjZGVmNmU0MzliIDEwMDY0NAotLS0gYS9X ZWJzaXRlcy93ZWJraXQtcGVyZi5hcHBzcG90LmNvbS9yZXBvcnRfaGFuZGxlci5weQorKysgYi9X ZWJzaXRlcy93ZWJraXQtcGVyZi5hcHBzcG90LmNvbS9yZXBvcnRfaGFuZGxlci5weQpAQCAtNjks NyArNjksNyBAQCBjbGFzcyBSZXBvcnRIYW5kbGVyKHdlYmFwcDIuUmVxdWVzdEhhbmRsZXIpOgog ICAgICAgICBpZiBidWlsZGVyIGFuZCBub3QgKHNlbGYuYnlwYXNzX2F1dGhlbnRpY2F0aW9uKCkg b3IgYnVpbGRlci5hdXRoZW50aWNhdGUocGFzc3dvcmQpKToKICAgICAgICAgICAgIHNlbGYuX291 dHB1dCgnQXV0aGVudGljYXRpb24gZmFpbGVkJykKIAotICAgICAgICBpZiBub3Qgc2VsZi5fcmVz dWx0c19hcmVfdmFsaWQobG9nKToKKyAgICAgICAgaWYgbm90IGxvZy5yZXN1bHRzX2FyZV93ZWxs X2Zvcm1lZCgpOgogICAgICAgICAgICAgc2VsZi5fb3V0cHV0KCJUaGUgcGF5bG9hZCBkb2Vzbid0 IGNvbnRhaW4gcmVzdWx0cyBvciByZXN1bHRzIGFyZSBtYWxmb3JtZWQiKQogCiAgICAgICAgIGlm IHNlbGYuX2VuY291bnRlcmVkX2Vycm9yOgpAQCAtODcsMzMgKzg3LDYgQEAgY2xhc3MgUmVwb3J0 SGFuZGxlcih3ZWJhcHAyLlJlcXVlc3RIYW5kbGVyKToKICAgICBkZWYgYnlwYXNzX2F1dGhlbnRp Y2F0aW9uKHNlbGYpOgogICAgICAgICByZXR1cm4gRmFsc2UKIAotICAgIGRlZiBfcmVzdWx0c19h cmVfdmFsaWQoc2VsZiwgbG9nKToKLQotICAgICAgICBkZWYgX2lzX2Zsb2F0X2NvbnZlcnRpYmxl KHZhbHVlKToKLSAgICAgICAgICAgIHRyeToKLSAgICAgICAgICAgICAgICBmbG9hdCh2YWx1ZSkK LSAgICAgICAgICAgICAgICByZXR1cm4gVHJ1ZQotICAgICAgICAgICAgZXhjZXB0IFR5cGVFcnJv cjoKLSAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UKLSAgICAgICAgICAgIGV4Y2VwdCBWYWx1 ZUVycm9yOgotICAgICAgICAgICAgICAgIHJldHVybiBGYWxzZQotCi0gICAgICAgIGlmIG5vdCBp c2luc3RhbmNlKGxvZy5yZXN1bHRzKCksIGRpY3QpOgotICAgICAgICAgICAgcmV0dXJuIEZhbHNl Ci0KLSAgICAgICAgZm9yIHRlc3RSZXN1bHQgaW4gbG9nLnJlc3VsdHMoKS52YWx1ZXMoKToKLSAg ICAgICAgICAgIGlmIGlzaW5zdGFuY2UodGVzdFJlc3VsdCwgZGljdCk6Ci0gICAgICAgICAgICAg ICAgZm9yIHZhbHVlIGluIHRlc3RSZXN1bHQudmFsdWVzKCk6Ci0gICAgICAgICAgICAgICAgICAg IGlmIG5vdCBfaXNfZmxvYXRfY29udmVydGlibGUodmFsdWUpOgotICAgICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIEZhbHNlCi0gICAgICAgICAgICAgICAgaWYgJ2F2Zycgbm90IGluIHRlc3RS ZXN1bHQ6Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiBGYWxzZQotICAgICAgICAgICAgICAg IGNvbnRpbnVlCi0gICAgICAgICAgICBpZiBub3QgX2lzX2Zsb2F0X2NvbnZlcnRpYmxlKHRlc3RS ZXN1bHQpOgotICAgICAgICAgICAgICAgIHJldHVybiBGYWxzZQotCi0gICAgICAgIHJldHVybiBU cnVlCi0KIAogY2xhc3MgQWRtaW5SZXBvcnRIYW5kbGVyKFJlcG9ydEhhbmRsZXIpOgogICAgIGRl ZiBieXBhc3NfYXV0aGVudGljYXRpb24oc2VsZik6CmRpZmYgLS1naXQgYS9XZWJzaXRlcy93ZWJr aXQtcGVyZi5hcHBzcG90LmNvbS9yZXBvcnRfcHJvY2Vzc19oYW5kbGVyLnB5IGIvV2Vic2l0ZXMv d2Via2l0LXBlcmYuYXBwc3BvdC5jb20vcmVwb3J0X3Byb2Nlc3NfaGFuZGxlci5weQppbmRleCA3 MTAzNzg1YzQxNjIyYjk0MzcyOGY4NzQyMGQ1OTFiNzY0M2Y3MGI1Li5mNTdiNTU3ODI2ZmQ5MTkz NDBiMmYxNzUwZWE1NmNiN2EyODM5MzViIDEwMDY0NAotLS0gYS9XZWJzaXRlcy93ZWJraXQtcGVy Zi5hcHBzcG90LmNvbS9yZXBvcnRfcHJvY2Vzc19oYW5kbGVyLnB5CisrKyBiL1dlYnNpdGVzL3dl YmtpdC1wZXJmLmFwcHNwb3QuY29tL3JlcG9ydF9wcm9jZXNzX2hhbmRsZXIucHkKQEAgLTU4LDcg KzU4LDcgQEAgY2xhc3MgUmVwb3J0UHJvY2Vzc0hhbmRsZXIod2ViYXBwMi5SZXF1ZXN0SGFuZGxl cik6CiAgICAgICAgIGJ1aWxkID0gQnVpbGQuZ2V0X29yX2luc2VydF9mcm9tX2xvZyhsb2cpCiAK ICAgICAgICAgZm9yIHRlc3RfbmFtZSwgcmVzdWx0X3ZhbHVlIGluIGxvZy5yZXN1bHRzKCkuaXRl cml0ZW1zKCk6Ci0gICAgICAgICAgICB0ZXN0ID0gVGVzdC51cGRhdGVfb3JfaW5zZXJ0KHRlc3Rf bmFtZSwgYnJhbmNoLCBwbGF0Zm9ybSkKKyAgICAgICAgICAgIHRlc3QgPSBUZXN0LnVwZGF0ZV9v cl9pbnNlcnQodGVzdF9uYW1lLCBicmFuY2gsIHBsYXRmb3JtLCByZXN1bHRfdmFsdWUuZ2V0KCd1 bml0JykpCiAgICAgICAgICAgICByZXN1bHQgPSBUZXN0UmVzdWx0LmdldF9vcl9pbnNlcnRfZnJv bV9wYXJzZWRfanNvbih0ZXN0X25hbWUsIGJ1aWxkLCByZXN1bHRfdmFsdWUpCiAgICAgICAgICAg ICBydW5zID0gUnVucy5nZXRfYnlfb2JqZWN0cyhicmFuY2gsIHBsYXRmb3JtLCB0ZXN0KQogICAg ICAgICAgICAgcmVnZW5lcmF0ZV9ydW5zID0gVHJ1ZQpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIv Q2hhbmdlTG9nCmluZGV4IDU0OTA0OWZjM2VmMjM3M2Y3NGU2MzNlMTI0OGM5NDcwYzA0ODlkOWMu LjJlOTA0MjE3ZWRjMWEwYzEyZjkwZDEwOWY2MzFkY2QxOGU5YWMxNGIgMTAwNjQ0Ci0tLSBhL0No YW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyOCBAQAogMjAxMi0wNC0wMSAgUnlv c3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAorICAgICAgICBwZXJmLW8tbWF0aWMgc2hv dWxkIHN0b3JlIHRlc3QgcmVzdWx0cycgdW5pdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTgyODUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBXZWJzaXRlcy93ZWJraXQtcGVyZi5hcHBzcG90LmNvbS9t b2RlbHMucHk6CisgICAgICAgIChUZXN0KToKKyAgICAgICAgKFRlc3QudXBkYXRlX29yX2luc2Vy dCk6IEFkZGVkICJ1bml0IiB0byB0aGUgYXJndW1lbnQgbGlzdC4KKyAgICAgICAgKFRlc3QudXBk YXRlX29yX2luc2VydC5leGVjdXRlKTogU3RvcmUgdGhlIHVuaXQuCisgICAgICAgIChSZXBvcnRM b2cucmVzdWx0c19hcmVfd2VsbF9mb3JtZWQpOiBNb3ZlZCBmcm9tIFJlcG9ydEhhbmRsZXIuCisg ICAgICAgIChSZXBvcnRMb2cucmVzdWx0c19hcmVfd2VsbF9mb3JtZWQuX2lzX2Zsb2F0X2NvbnZl cnRpYmxlKTogRGl0dG8uCisgICAgICAgICogV2Vic2l0ZXMvd2Via2l0LXBlcmYuYXBwc3BvdC5j b20vbW9kZWxzX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdE1vZGVsVGVzdHMudGVzdF91cGRh dGVfb3JfaW5zZXJ0KTogQWRkZWQgYSB0ZXN0IGNhc2UgZm9yICJ1bml0IiBhcmd1bWVudC4KKyAg ICAgICAgKFRlc3RNb2RlbFRlc3RzLnRlc3RfdXBkYXRlX29yX2luc2VydF90b191cGRhdGUpOiBE aXR0by4KKyAgICAgICAgKFJlcG9ydExvZ1Rlc3RzLnRlc3RfcmVzdWx0c19hcmVfd2VsbF9mb3Jt ZWQpOiBBZGRlZC4KKyAgICAgICAgKFJlcG9ydExvZ1Rlc3RzLnRlc3RfcmVzdWx0c19hcmVfd2Vs bF9mb3JtZWQuYXNzZXJ0X3Jlc3VsdHNfYXJlX3dlbGxfZm9ybWVkKTogQWRkZWQuCisgICAgICAg ICogV2Vic2l0ZXMvd2Via2l0LXBlcmYuYXBwc3BvdC5jb20vcmVwb3J0X2hhbmRsZXIucHk6Cisg ICAgICAgIChSZXBvcnRIYW5kbGVyLnBvc3QpOiBDYWxscyBSZXBvcnRMb2cucmVzdWx0c19hcmVf d2VsbF9mb3JtZWQuCisgICAgICAgICogV2Vic2l0ZXMvd2Via2l0LXBlcmYuYXBwc3BvdC5jb20v cmVwb3J0X3Byb2Nlc3NfaGFuZGxlci5weToKKyAgICAgICAgKFJlcG9ydFByb2Nlc3NIYW5kbGVy LnBvc3QpOiBQYXNzZXMgcmVzdWx0c1sndW5pdCddIHRvIFRlc3QudXBkYXRlX29yX2luc2VydC4K KworMjAxMi0wNC0wMSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KKwogICAgICAg ICBBZG1pbiBwYWdlIHNob3VsZCBsZXhpY29sb2dpY2FsbHkgc29ydCB0ZXN0cwogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI4NDkKIAo=