111030 2013-02-27 19:08:07 -0800 Merge more methods on PerfTest 2013-02-28 13:54:10 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 97510 1 rniwa rniwa abarth benjamin dpranke eric webkit.review.bot zoltan oldest_to_newest 843644 0 rniwa 2013-02-27 19:08:07 -0800 PerfTest has way too many miscellaneous methods. Merge them as much as we can to make the class more coherent and comprehensible. 843646 1 190635 rniwa 2013-02-27 19:13:43 -0800 Created attachment 190635 Cleanup 843670 2 webkit.review.bot 2013-02-27 20:33:31 -0800 Attachment 190635 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/webkitpy/performance_tests/perftest.py', u'Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py']" exit_code: 1 Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py:166: [TestPerfTest.test_parse_output_with_failing_line] Instance of 'TestPerfTest' has no 'assertIsNone' member [pylint/E1101] [5] Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py:201: [TestPerfTest.test_ignored_stderr_lines] Instance of 'TestPerfTest' has no 'assertEqual' member [pylint/E1101] [5] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 844381 3 190635 dpranke 2013-02-28 12:53:27 -0800 Comment on attachment 190635 Cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=190635&action=review >> Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py:166 >> + self.assertIsNone(test._run_with_driver(None, None)) > > [TestPerfTest.test_parse_output_with_failing_line] Instance of 'TestPerfTest' has no 'assertIsNone' member [pylint/E1101] [5] I think this are false positives having to do with our unittest2 shenanigans. Mind filing a bug for that? 844437 4 190635 rniwa 2013-02-28 13:45:05 -0800 Comment on attachment 190635 Cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=190635&action=review >>> Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py:166 >>> + self.assertIsNone(test._run_with_driver(None, None)) >> >> [TestPerfTest.test_parse_output_with_failing_line] Instance of 'TestPerfTest' has no 'assertIsNone' member [pylint/E1101] [5] > > I think this are false positives having to do with our unittest2 shenanigans. Mind filing a bug for that? Filed https://bugs.webkit.org/show_bug.cgi?id=111108. 844447 5 190635 rniwa 2013-02-28 13:54:07 -0800 Comment on attachment 190635 Cleanup Clearing flags on attachment: 190635 Committed r144363: <http://trac.webkit.org/changeset/144363> 844448 6 rniwa 2013-02-28 13:54:10 -0800 All reviewed patches have been landed. Closing bug. 190635 2013-02-27 19:13:43 -0800 2013-02-28 13:54:07 -0800 Cleanup bug-111030-20130227190956.patch text/plain 9760 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE0NDI1NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDEzLTAyLTI3ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIE1lcmdlIG1vcmUgbWV0aG9kcyBvbiBQZXJmVGVzdAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExMDMwCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWVyZ2VkIHBhcnNlX291dHB1dCBpbnRv IF9ydW5fd2l0aF9kcml2ZXIgYXMgaXQgd2FzIHRoZSBvbmx5IGNhbGxlci4gQWxzbyBtZXJnZWQg X3Nob3VsZF9pZ25vcmVfbGluZV9pbl9zdGRlcnIKKyAgICAgICAgYW5kIF9zaG91bGRfaWdub3Jl X2xpbmVfaW5fcGFyc2VyX3Rlc3RfcmVzdWx0IGludG8gX2ZpbHRlcl9vdXRwdXQgc2luY2UgaXQg d2FzIHRoZWlyIG9ubHkgY2FsbGVyLgorCisgICAgICAgIFRoaXMgbWFrZXMgdGhlIGNvbnRyb2wg ZmxvdyBhIGxvdCBtb3JlIGNvbXByZWhlbnNpYmxlLgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdC5weToKKyAgICAgICAgKFBlcmZUZXN0Ll9y dW5fd2l0aF9kcml2ZXIpOgorICAgICAgICAoUGVyZlRlc3QuX3Nob3VsZF9pZ25vcmVfbGluZSk6 CisgICAgICAgIChQZXJmVGVzdC5fZmlsdGVyX291dHB1dCk6CisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0X3VuaXR0ZXN0LnB5OgorICAgICAg ICAoVGVzdFBlcmZUZXN0Ll9hc3NlcnRfcmVzdWx0c19hcmVfY29ycmVjdCk6CisgICAgICAgICh0 ZXN0X2lnbm9yZWRfc3RkZXJyX2xpbmVzKToKKwogMjAxMy0wMi0yNyAgUnlvc3VrZSBOaXdhICA8 cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBNZXJnZSBQYWdlTG9hZGluZ1BlcmZUZXN0IGlu dG8gUmVwbGF5UGVyZlRlc3QKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFu Y2VfdGVzdHMvcGVyZnRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdC5weQkocmV2aXNpb24gMTQ0MjU1KQorKysgVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdC5weQkod29ya2lu ZyBjb3B5KQpAQCAtMTUxLDEzICsxNTEsNDEgQEAgY2xhc3MgUGVyZlRlc3Qob2JqZWN0KToKIAog ICAgICAgICByZXR1cm4gcmVzdWx0cwogCisgICAgX2Rlc2NyaXB0aW9uX3JlZ2V4ID0gcmUuY29t cGlsZShyJ15EZXNjcmlwdGlvbjogKD9QPGRlc2NyaXB0aW9uPi4qKSQnLCByZS5JR05PUkVDQVNF KQorICAgIF9tZXRyaWNzX3JlZ2V4ID0gcmUuY29tcGlsZShyJ14oP1A8bWV0cmljPlRpbWV8TWFs bG9jfEpTIEhlYXApOicpCisgICAgX3N0YXRpc3RpY3Nfa2V5cyA9IFsnYXZnJywgJ21lZGlhbics ICdzdGRldicsICdtaW4nLCAnbWF4JywgJ3VuaXQnLCAndmFsdWVzJ10KKyAgICBfc2NvcmVfcmVn ZXggPSByZS5jb21waWxlKHInXig/UDxrZXk+JyArIHInfCcuam9pbihfc3RhdGlzdGljc19rZXlz KSArIHInKVxzKyg/UDx2YWx1ZT4oWzAtOVwuXSsoLFxzKyk/KSspXHMqKD9QPHVuaXQ+LiopJykK KwogICAgIGRlZiBfcnVuX3dpdGhfZHJpdmVyKHNlbGYsIGRyaXZlciwgdGltZV9vdXRfbXMpOgog ICAgICAgICBvdXRwdXQgPSBzZWxmLnJ1bl9zaW5nbGUoZHJpdmVyLCBzZWxmLnRlc3RfcGF0aCgp LCB0aW1lX291dF9tcykKICAgICAgICAgc2VsZi5fZmlsdGVyX291dHB1dChvdXRwdXQpCiAgICAg ICAgIGlmIHNlbGYucnVuX2ZhaWxlZChvdXRwdXQpOgogICAgICAgICAgICAgcmV0dXJuIE5vbmUK IAotICAgICAgICByZXR1cm4gc2VsZi5wYXJzZV9vdXRwdXQob3V0cHV0KQorICAgICAgICBjdXJy ZW50X21ldHJpYyA9IE5vbmUKKyAgICAgICAgcmVzdWx0cyA9IFtdCisgICAgICAgIGZvciBsaW5l IGluIHJlLnNwbGl0KCdcbicsIG91dHB1dC50ZXh0KToKKyAgICAgICAgICAgIGlmIG5vdCBsaW5l OgorICAgICAgICAgICAgICAgIGNvbnRpbnVlCisKKyAgICAgICAgICAgIGRlc2NyaXB0aW9uX21h dGNoID0gc2VsZi5fZGVzY3JpcHRpb25fcmVnZXgubWF0Y2gobGluZSkKKyAgICAgICAgICAgIG1l dHJpY19tYXRjaCA9IHNlbGYuX21ldHJpY3NfcmVnZXgubWF0Y2gobGluZSkKKyAgICAgICAgICAg IHNjb3JlID0gc2VsZi5fc2NvcmVfcmVnZXgubWF0Y2gobGluZSkKKworICAgICAgICAgICAgaWYg ZGVzY3JpcHRpb25fbWF0Y2g6CisgICAgICAgICAgICAgICAgc2VsZi5fZGVzY3JpcHRpb24gPSBk ZXNjcmlwdGlvbl9tYXRjaC5ncm91cCgnZGVzY3JpcHRpb24nKQorICAgICAgICAgICAgZWxpZiBt ZXRyaWNfbWF0Y2g6CisgICAgICAgICAgICAgICAgY3VycmVudF9tZXRyaWMgPSBtZXRyaWNfbWF0 Y2guZ3JvdXAoJ21ldHJpYycpLnJlcGxhY2UoJyAnLCAnJykKKyAgICAgICAgICAgIGVsaWYgc2Nv cmU6CisgICAgICAgICAgICAgICAga2V5ID0gc2NvcmUuZ3JvdXAoJ2tleScpCisgICAgICAgICAg ICAgICAgaWYga2V5ID09ICd2YWx1ZXMnIGFuZCByZXN1bHRzICE9IE5vbmU6CisgICAgICAgICAg ICAgICAgICAgIHZhbHVlcyA9IFtmbG9hdChudW1iZXIpIGZvciBudW1iZXIgaW4gc2NvcmUuZ3Jv dXAoJ3ZhbHVlJykuc3BsaXQoJywgJyldCisgICAgICAgICAgICAgICAgICAgIHJlc3VsdHMuYXBw ZW5kKFBlcmZUZXN0TWV0cmljKGN1cnJlbnRfbWV0cmljLCBzY29yZS5ncm91cCgndW5pdCcpLCB2 YWx1ZXMpKQorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICByZXN1bHRzID0gTm9u ZQorICAgICAgICAgICAgICAgIF9sb2cuZXJyb3IoJ0VSUk9SOiAnICsgbGluZSkKKworICAgICAg ICByZXR1cm4gcmVzdWx0cwogCiAgICAgZGVmIHJ1bl9zaW5nbGUoc2VsZiwgZHJpdmVyLCB0ZXN0 X3BhdGgsIHRpbWVfb3V0X21zLCBzaG91bGRfcnVuX3BpeGVsX3Rlc3Q9RmFsc2UpOgogICAgICAg ICByZXR1cm4gZHJpdmVyLnJ1bl90ZXN0KERyaXZlcklucHV0KHRlc3RfcGF0aCwgdGltZV9vdXRf bXMsIGltYWdlX2hhc2g9Tm9uZSwgc2hvdWxkX3J1bl9waXhlbF90ZXN0PXNob3VsZF9ydW5fcGl4 ZWxfdGVzdCksIHN0b3Bfd2hlbl9kb25lPUZhbHNlKQpAQCAtMTc3LDcgKzIwNSw4IEBAIGNsYXNz IFBlcmZUZXN0KG9iamVjdCk6CiAKICAgICAgICAgcmV0dXJuIFRydWUKIAotICAgIGRlZiBfc2hv dWxkX2lnbm9yZV9saW5lKHNlbGYsIHJlZ2V4cHMsIGxpbmUpOgorICAgIEBzdGF0aWNtZXRob2QK KyAgICBkZWYgX3Nob3VsZF9pZ25vcmVfbGluZShyZWdleHBzLCBsaW5lKToKICAgICAgICAgaWYg bm90IGxpbmU6CiAgICAgICAgICAgICByZXR1cm4gVHJ1ZQogICAgICAgICBmb3IgcmVnZXhwIGlu IHJlZ2V4cHM6CkBAIC0xOTEsOSArMjIwLDYgQEAgY2xhc3MgUGVyZlRlc3Qob2JqZWN0KToKICAg ICAgICAgcmUuY29tcGlsZShyJ15cW0lORk86JyksCiAgICAgXQogCi0gICAgZGVmIF9zaG91bGRf aWdub3JlX2xpbmVfaW5fc3RkZXJyKHNlbGYsIGxpbmUpOgotICAgICAgICByZXR1cm4gc2VsZi5f c2hvdWxkX2lnbm9yZV9saW5lKHNlbGYuX2xpbmVzX3RvX2lnbm9yZV9pbl9zdGRlcnIsIGxpbmUp Ci0KICAgICBfbGluZXNfdG9faWdub3JlX2luX3BhcnNlcl9yZXN1bHQgPSBbCiAgICAgICAgIHJl LmNvbXBpbGUocideUnVubmluZyBcZCsgdGltZXMkJyksCiAgICAgICAgIHJlLmNvbXBpbGUocide SWdub3Jpbmcgd2FybS11cCAnKSwKQEAgLTIxMCw0NiArMjM2LDExIEBAIGNsYXNzIFBlcmZUZXN0 KG9iamVjdCk6CiAgICAgICAgIHJlLmNvbXBpbGUocicoP1A8bmFtZT4uKyk6IFxbKD9QPHZhbHVl cz4oXGQrKC5cZCspPyxccyspKlxkKyguXGQrKT8pXF0nKSwKICAgICBdCiAKLSAgICBkZWYgX3No b3VsZF9pZ25vcmVfbGluZV9pbl9wYXJzZXJfdGVzdF9yZXN1bHQoc2VsZiwgbGluZSk6Ci0gICAg ICAgIHJldHVybiBzZWxmLl9zaG91bGRfaWdub3JlX2xpbmUoc2VsZi5fbGluZXNfdG9faWdub3Jl X2luX3BhcnNlcl9yZXN1bHQsIGxpbmUpCi0KICAgICBkZWYgX2ZpbHRlcl9vdXRwdXQoc2VsZiwg b3V0cHV0KToKICAgICAgICAgaWYgb3V0cHV0LmVycm9yOgotICAgICAgICAgICAgZmlsdGVyZWRf ZXJyb3IgPSAnXG4nLmpvaW4oW2xpbmUgZm9yIGxpbmUgaW4gcmUuc3BsaXQoJ1xuJywgb3V0cHV0 LmVycm9yKSBpZiBub3Qgc2VsZi5fc2hvdWxkX2lnbm9yZV9saW5lX2luX3N0ZGVycihsaW5lKV0p Ci0gICAgICAgICAgICBvdXRwdXQuZXJyb3IgPSBmaWx0ZXJlZF9lcnJvciBpZiBmaWx0ZXJlZF9l cnJvciBlbHNlIE5vbmUKKyAgICAgICAgICAgIG91dHB1dC5lcnJvciA9ICdcbicuam9pbihbbGlu ZSBmb3IgbGluZSBpbiByZS5zcGxpdCgnXG4nLCBvdXRwdXQuZXJyb3IpIGlmIG5vdCBzZWxmLl9z aG91bGRfaWdub3JlX2xpbmUoc2VsZi5fbGluZXNfdG9faWdub3JlX2luX3N0ZGVyciwgbGluZSld KQogICAgICAgICBpZiBvdXRwdXQudGV4dDoKLSAgICAgICAgICAgIG91dHB1dC50ZXh0ID0gJ1xu Jy5qb2luKFtsaW5lIGZvciBsaW5lIGluIHJlLnNwbGl0KCdcbicsIG91dHB1dC50ZXh0KSBpZiBu b3Qgc2VsZi5fc2hvdWxkX2lnbm9yZV9saW5lX2luX3BhcnNlcl90ZXN0X3Jlc3VsdChsaW5lKV0p Ci0KLSAgICBfZGVzY3JpcHRpb25fcmVnZXggPSByZS5jb21waWxlKHInXkRlc2NyaXB0aW9uOiAo P1A8ZGVzY3JpcHRpb24+LiopJCcsIHJlLklHTk9SRUNBU0UpCi0gICAgX21ldHJpY3NfcmVnZXgg PSByZS5jb21waWxlKHInXig/UDxtZXRyaWM+VGltZXxNYWxsb2N8SlMgSGVhcCk6JykKLSAgICBf c3RhdGlzdGljc19rZXlzID0gWydhdmcnLCAnbWVkaWFuJywgJ3N0ZGV2JywgJ21pbicsICdtYXgn LCAndW5pdCcsICd2YWx1ZXMnXQotICAgIF9zY29yZV9yZWdleCA9IHJlLmNvbXBpbGUocideKD9Q PGtleT4nICsgcid8Jy5qb2luKF9zdGF0aXN0aWNzX2tleXMpICsgcicpXHMrKD9QPHZhbHVlPihb MC05XC5dKygsXHMrKT8pKylccyooP1A8dW5pdD4uKiknKQotCi0gICAgZGVmIHBhcnNlX291dHB1 dChzZWxmLCBvdXRwdXQpOgotICAgICAgICBjdXJyZW50X21ldHJpYyA9IE5vbmUKLSAgICAgICAg cmVzdWx0cyA9IFtdCi0gICAgICAgIGZvciBsaW5lIGluIHJlLnNwbGl0KCdcbicsIG91dHB1dC50 ZXh0KToKLSAgICAgICAgICAgIGlmIG5vdCBsaW5lOgotICAgICAgICAgICAgICAgIGNvbnRpbnVl Ci0KLSAgICAgICAgICAgIGRlc2NyaXB0aW9uX21hdGNoID0gc2VsZi5fZGVzY3JpcHRpb25fcmVn ZXgubWF0Y2gobGluZSkKLSAgICAgICAgICAgIG1ldHJpY19tYXRjaCA9IHNlbGYuX21ldHJpY3Nf cmVnZXgubWF0Y2gobGluZSkKLSAgICAgICAgICAgIHNjb3JlID0gc2VsZi5fc2NvcmVfcmVnZXgu bWF0Y2gobGluZSkKLQotICAgICAgICAgICAgaWYgZGVzY3JpcHRpb25fbWF0Y2g6Ci0gICAgICAg ICAgICAgICAgc2VsZi5fZGVzY3JpcHRpb24gPSBkZXNjcmlwdGlvbl9tYXRjaC5ncm91cCgnZGVz Y3JpcHRpb24nKQotICAgICAgICAgICAgZWxpZiBtZXRyaWNfbWF0Y2g6Ci0gICAgICAgICAgICAg ICAgY3VycmVudF9tZXRyaWMgPSBtZXRyaWNfbWF0Y2guZ3JvdXAoJ21ldHJpYycpLnJlcGxhY2Uo JyAnLCAnJykKLSAgICAgICAgICAgIGVsaWYgc2NvcmU6Ci0gICAgICAgICAgICAgICAga2V5ID0g c2NvcmUuZ3JvdXAoJ2tleScpCi0gICAgICAgICAgICAgICAgaWYga2V5ID09ICd2YWx1ZXMnIGFu ZCByZXN1bHRzICE9IE5vbmU6Ci0gICAgICAgICAgICAgICAgICAgIHZhbHVlcyA9IFtmbG9hdChu dW1iZXIpIGZvciBudW1iZXIgaW4gc2NvcmUuZ3JvdXAoJ3ZhbHVlJykuc3BsaXQoJywgJyldCi0g ICAgICAgICAgICAgICAgICAgIHJlc3VsdHMuYXBwZW5kKFBlcmZUZXN0TWV0cmljKGN1cnJlbnRf bWV0cmljLCBzY29yZS5ncm91cCgndW5pdCcpLCB2YWx1ZXMpKQotICAgICAgICAgICAgZWxzZToK LSAgICAgICAgICAgICAgICByZXN1bHRzID0gTm9uZQotICAgICAgICAgICAgICAgIF9sb2cuZXJy b3IoJ0VSUk9SOiAnICsgbGluZSkKLQotICAgICAgICByZXR1cm4gcmVzdWx0cworICAgICAgICAg ICAgb3V0cHV0LnRleHQgPSAnXG4nLmpvaW4oW2xpbmUgZm9yIGxpbmUgaW4gcmUuc3BsaXQoJ1xu Jywgb3V0cHV0LnRleHQpIGlmIG5vdCBzZWxmLl9zaG91bGRfaWdub3JlX2xpbmUoc2VsZi5fbGlu ZXNfdG9faWdub3JlX2luX3BhcnNlcl9yZXN1bHQsIGxpbmUpXSkKIAogICAgIGRlZiBvdXRwdXRf c3RhdGlzdGljcyhzZWxmLCB0ZXN0X25hbWUsIHJlc3VsdHMpOgogICAgICAgICB1bml0ID0gcmVz dWx0c1sndW5pdCddCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rl c3RzL3BlcmZ0ZXN0X3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RfdW5pdHRlc3QucHkJKHJldmlzaW9uIDE0 NDI1NSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRl c3RfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTEwNiw4ICsxMDYsOCBAQCBjbGFzcyBU ZXN0UGVyZlRlc3RNZXRyaWModW5pdHRlc3QuVGVzdENhCiAKIGNsYXNzIFRlc3RQZXJmVGVzdCh1 bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIF9hc3NlcnRfcmVzdWx0c19hcmVfY29ycmVjdChz ZWxmLCB0ZXN0LCBvdXRwdXQpOgotICAgICAgICB0ZXN0Ll9maWx0ZXJfb3V0cHV0KG91dHB1dCkK LSAgICAgICAgcGFyc2VkX3Jlc3VsdHMgPSB0ZXN0LnBhcnNlX291dHB1dChvdXRwdXQpCisgICAg ICAgIHRlc3QucnVuX3NpbmdsZSA9IGxhbWJkYSBkcml2ZXIsIHBhdGgsIHRpbWVfb3V0X21zOiBv dXRwdXQKKyAgICAgICAgcGFyc2VkX3Jlc3VsdHMgPSB0ZXN0Ll9ydW5fd2l0aF9kcml2ZXIoTm9u ZSwgTm9uZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsZW4ocGFyc2VkX3Jlc3VsdHMpLCAx KQogICAgICAgICBzb21lX3Rlc3RfcmVzdWx0cyA9IHBhcnNlZF9yZXN1bHRzWzBdLnRvX2RpY3Qo KQogICAgICAgICBzZWxmLmFzc2VydEl0ZW1zRXF1YWwoc29tZV90ZXN0X3Jlc3VsdHMua2V5cygp LCBbJ2F2ZycsICdtYXgnLCAnbWVkaWFuJywgJ21pbicsICdzdGRldicsICd1bml0JywgJ3ZhbHVl cyddKQpAQCAtMTYyLDggKzE2Miw4IEBAIG1heCAxMTIwIG1zCiAgICAgICAgIG91dHB1dF9jYXB0 dXJlLmNhcHR1cmVfb3V0cHV0KCkKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgdGVzdCA9IFBl cmZUZXN0KE1vY2tQb3J0KCksICdzb21lLXRlc3QnLCAnL3BhdGgvc29tZS1kaXIvc29tZS10ZXN0 JykKLSAgICAgICAgICAgIHRlc3QuX2ZpbHRlcl9vdXRwdXQob3V0cHV0KQotICAgICAgICAgICAg c2VsZi5hc3NlcnRJc05vbmUodGVzdC5wYXJzZV9vdXRwdXQob3V0cHV0KSkKKyAgICAgICAgICAg IHRlc3QucnVuX3NpbmdsZSA9IGxhbWJkYSBkcml2ZXIsIHBhdGgsIHRpbWVfb3V0X21zOiBvdXRw dXQKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0SXNOb25lKHRlc3QuX3J1bl93aXRoX2RyaXZlcihO b25lLCBOb25lKSkKICAgICAgICAgZmluYWxseToKICAgICAgICAgICAgIGFjdHVhbF9zdGRvdXQs IGFjdHVhbF9zdGRlcnIsIGFjdHVhbF9sb2dzID0gb3V0cHV0X2NhcHR1cmUucmVzdG9yZV9vdXRw dXQoKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGFjdHVhbF9zdGRvdXQsICcnKQpAQCAtMTkw LDIxICsxOTAsMTggQEAgbWF4IDExMjAgbXMiIiIsIGltYWdlPU5vbmUsIGltYWdlX2hhc2g9Tgog CiAgICAgZGVmIHRlc3RfaWdub3JlZF9zdGRlcnJfbGluZXMoc2VsZik6CiAgICAgICAgIHRlc3Qg PSBQZXJmVGVzdChNb2NrUG9ydCgpLCAnc29tZS10ZXN0JywgJy9wYXRoL3NvbWUtZGlyL3NvbWUt dGVzdCcpCi0gICAgICAgIGlnbm9yZWRfbGluZXMgPSBbCi0gICAgICAgICAgICAiVW5rbm93biBv cHRpb246IC0tZm9vLWJhciIsCi0gICAgICAgICAgICAiW1dBUk5JTkc6cHJveHlfc2VydmljZS5j Y10gYmFkIG1vb24gYS1yaXNpbmciLAotICAgICAgICAgICAgIltJTkZPOlNrRm9udEhvc3RfYW5k cm9pZC5jcHAoMTE1OCldIFVzZSBUZXN0IENvbmZpZyBGaWxlIE1haW4gL2RhdGEvbG9jYWwvdG1w L2RydC9hbmRyb2lkX21haW5fZm9udHMueG1sLCBGYWxsYmFjayAvZGF0YS9sb2NhbC90bXAvZHJ0 L2FuZHJvaWRfZmFsbGJhY2tfZm9udHMueG1sLCBGb250IERpciAvZGF0YS9sb2NhbC90bXAvZHJ0 L2ZvbnRzLyIsCi0gICAgICAgIF0KLSAgICAgICAgZm9yIGxpbmUgaW4gaWdub3JlZF9saW5lczoK LSAgICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSh0ZXN0Ll9zaG91bGRfaWdub3JlX2xpbmVfaW5f c3RkZXJyKGxpbmUpKQotCi0gICAgICAgIG5vbl9pZ25vcmVkX2xpbmVzID0gWwotICAgICAgICAg ICAgIlNob3VsZCBub3QgYmUgaWdub3JlZCIsCi0gICAgICAgICAgICAiW1dBUk5JTkc6Y2hyb21l LmNjXSBTb21ldGhpbmcgd2VudCB3cm9uZyIsCi0gICAgICAgICAgICAiW0VSUk9SOm1haW4uY2Nd IFRoZSBza3kgaGFzIGZhbGxlbiIsCi0gICAgICAgIF0KLSAgICAgICAgZm9yIGxpbmUgaW4gbm9u X2lnbm9yZWRfbGluZXM6Ci0gICAgICAgICAgICBzZWxmLmFzc2VydEZhbHNlKHRlc3QuX3Nob3Vs ZF9pZ25vcmVfbGluZV9pbl9zdGRlcnIobGluZSkpCisgICAgICAgIG91dHB1dF93aXRoX2xpbmVz X3RvX2lnbm9yZSA9IERyaXZlck91dHB1dCgnJywgaW1hZ2U9Tm9uZSwgaW1hZ2VfaGFzaD1Ob25l LCBhdWRpbz1Ob25lLCBlcnJvcj0iIiIKK1Vua25vd24gb3B0aW9uOiAtLWZvby1iYXIKK1Nob3Vs ZCBub3QgYmUgaWdub3JlZAorW1dBUk5JTkc6cHJveHlfc2VydmljZS5jY10gYmFkIG1vb24gYS1y aXNpbmcKK1tXQVJOSU5HOmNocm9tZS5jY10gU29tZXRoaW5nIHdlbnQgd3JvbmcKK1tJTkZPOlNr Rm9udEhvc3RfYW5kcm9pZC5jcHAoMTE1OCldIFVzZSBUZXN0IENvbmZpZyBGaWxlIE1haW4gL2Rh dGEvbG9jYWwvdG1wL2RydC9hbmRyb2lkX21haW5fZm9udHMueG1sLCBGYWxsYmFjayAvZGF0YS9s b2NhbC90bXAvZHJ0L2FuZHJvaWRfZmFsbGJhY2tfZm9udHMueG1sLCBGb250IERpciAvZGF0YS9s b2NhbC90bXAvZHJ0L2ZvbnRzLworW0VSUk9SOm1haW4uY2NdIFRoZSBza3kgaGFzIGZhbGxlbiIi IikKKyAgICAgICAgdGVzdC5fZmlsdGVyX291dHB1dChvdXRwdXRfd2l0aF9saW5lc190b19pZ25v cmUpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwob3V0cHV0X3dpdGhfbGluZXNfdG9faWdub3Jl LmVycm9yLAorICAgICAgICAgICAgIlNob3VsZCBub3QgYmUgaWdub3JlZFxuIgorICAgICAgICAg ICAgIltXQVJOSU5HOmNocm9tZS5jY10gU29tZXRoaW5nIHdlbnQgd3JvbmdcbiIKKyAgICAgICAg ICAgICJbRVJST1I6bWFpbi5jY10gVGhlIHNreSBoYXMgZmFsbGVuIikKIAogICAgIGRlZiB0ZXN0 X3BhcnNlX291dHB1dF93aXRoX3N1YnRlc3RzKHNlbGYpOgogICAgICAgICBvdXRwdXQgPSBEcml2 ZXJPdXRwdXQoIiIiCg==