52756 2011-01-19 15:29:28 -0800 nrwt: remove fs refs from printing, test_failures, test_expectations, text_diff 2011-01-20 16:58:43 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 52754 1 dpranke dpranke eric mihaip ojan tony oldest_to_newest 336872 0 dpranke 2011-01-19 15:29:28 -0800 nrwt: remove fs refs from printing, test_failures, test_expectations, text_diff 336875 1 79502 dpranke 2011-01-19 15:31:45 -0800 Created attachment 79502 Patch 337230 2 79502 eric 2011-01-20 03:10:04 -0800 Comment on attachment 79502 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=79502&action=review > Tools/Scripts/webkitpy/layout_tests/layout_package/test_failures.py:126 > - return os.path.splitext(filename)[0] + modifier > + # FIXME: technically this breaks if files don't use ".ext" to indicate > + # the extension, but passing in a Filesystem object here is a huge > + # hassle. > + return filename[filename.rfind('.')] + modifier I might have just left this using os.path.splitext with a FIXME about using filesystem instead. > Tools/Scripts/webkitpy/layout_tests/test_types/text_diff.py:-36 > -from __future__ import with_statement We're sure this isn't needed? 337231 3 79502 eric 2011-01-20 03:10:28 -0800 Comment on attachment 79502 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=79502&action=review >> Tools/Scripts/webkitpy/layout_tests/layout_package/test_failures.py:126 >> + return filename[filename.rfind('.')] + modifier > > I might have just left this using os.path.splitext with a FIXME about using filesystem instead. Does this need testing? 337632 4 dpranke 2011-01-20 15:05:39 -0800 Committed r76288: <http://trac.webkit.org/changeset/76288> 337633 5 dpranke 2011-01-20 15:06:14 -0800 In reply to comment #2) > (From update of attachment 79502 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=79502&action=review > > > Tools/Scripts/webkitpy/layout_tests/layout_package/test_failures.py:126 > > - return os.path.splitext(filename)[0] + modifier > > + # FIXME: technically this breaks if files don't use ".ext" to indicate > > + # the extension, but passing in a Filesystem object here is a huge > > + # hassle. > > + return filename[filename.rfind('.')] + modifier > > I might have just left this using os.path.splitext with a FIXME about using filesystem instead. > I felt it was better to not have any reference to os.path at all. > > Tools/Scripts/webkitpy/layout_tests/test_types/text_diff.py:-36 > > -from __future__ import with_statement > > We're sure this isn't needed? Yes. There are no "with" statements in the file. 337634 6 dpranke 2011-01-20 15:06:28 -0800 (In reply to comment #3) > (From update of attachment 79502 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=79502&action=review > > >> Tools/Scripts/webkitpy/layout_tests/layout_package/test_failures.py:126 > >> + return filename[filename.rfind('.')] + modifier > > > > I might have just left this using os.path.splitext with a FIXME about using filesystem instead. > > Does this need testing? It is covered by the existing tests. 337724 7 dpranke 2011-01-20 16:58:43 -0800 (In reply to comment #6) > (In reply to comment #3) > > (From update of attachment 79502 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=79502&action=review > > > > >> Tools/Scripts/webkitpy/layout_tests/layout_package/test_failures.py:126 > > >> + return filename[filename.rfind('.')] + modifier > > > > > > I might have just left this using os.path.splitext with a FIXME about using filesystem instead. > > > > Does this need testing? > > It is covered by the existing tests. Or so I thought :( . See bug 52854. 79502 2011-01-19 15:31:45 -0800 2011-01-20 03:10:28 -0800 Patch bug-52756-20110119153144.patch text/plain 10247 dpranke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyNWI2 MjM5YzRlNjlkNjE3NGVlMmFjMWMwMmI0MjQyNGM3ZjczOTg4Li4zYzFmMWU5NzM4OWNlYzdlZDZl YmU1ZDNmMTNkNjE3NDMwMDBiM2UzIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjEgQEAKIAogICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBucnd0OiByZW1vdmUgZnMgcmVmcyBmcm9tIHByaW50 aW5nLCB0ZXN0X2ZhaWx1cmVzLCB0ZXN0X2V4cGVjdGF0aW9ucywgdGV4dF9kaWZmCisKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyNzU2CisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9wcmludGlu Zy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFj a2FnZS9wcmludGluZ191bml0dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS90ZXN0X2V4cGVjdGF0aW9ucy5weToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS90ZXN0X2V4cGVj dGF0aW9uc191bml0dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9sYXlvdXRfcGFja2FnZS90ZXN0X2ZhaWx1cmVzLnB5OgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvdGV4dF9kaWZmLnB5OgorCisyMDExLTAx LTE5ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIG5yd3Q6IHJlbW92ZSBmcyByZWZzIGZy b20gbGF5b3V0X3BhY2thZ2UvanNvbioKIAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTI3NTQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3ByaW50aW5nLnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvcHJpbnRpbmcucHkKaW5kZXgg N2E2YWFkMWE0MzE4OWFhMDBkMmUyZGI2MWEwZGYwNDllNzE5ZjBmOC4uZTEwYWQ5OTA3ZWIyYWMx MzRjNTE5YTQ1OWEyOWVkYzYxOWIwMzgwMSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvcHJpbnRpbmcucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvcHJpbnRpbmcucHkK QEAgLTMxLDggKzMxLDYgQEAKIAogaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBvcHRwYXJzZQotaW1w b3J0IG9zCi1pbXBvcnQgcGRiCiAKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLmxheW91dF9w YWNrYWdlIGltcG9ydCBtZXRlcmVkX3N0cmVhbQogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMu bGF5b3V0X3BhY2thZ2UgaW1wb3J0IHRlc3RfZXhwZWN0YXRpb25zCkBAIC00MTEsNyArNDA5LDcg QEAgY2xhc3MgUHJpbnRlcihvYmplY3QpOgogICAgICAgICAgICAgcmV0dXJuCiAKICAgICAgICAg bmV4dF90ZXN0ID0gdGVzdF9saXN0W3NlbGYuX2N1cnJlbnRfdGVzdF9udW1iZXJdCi0gICAgICAg IG5leHRfZGlyID0gb3MucGF0aC5kaXJuYW1lKAorICAgICAgICBuZXh0X2RpciA9IHNlbGYuX3Bv cnQuX2ZpbGVzeXN0ZW0uZGlybmFtZSgKICAgICAgICAgICAgIHNlbGYuX3BvcnQucmVsYXRpdmVf dGVzdF9maWxlbmFtZShuZXh0X3Rlc3QpKQogICAgICAgICBpZiBzZWxmLl9jdXJyZW50X3Byb2dy ZXNzX3N0ciA9PSAiIjoKICAgICAgICAgICAgIHNlbGYuX2N1cnJlbnRfcHJvZ3Jlc3Nfc3RyID0g IiVzOiAiICUgKG5leHRfZGlyKQpAQCAtNDM3LDcgKzQzNSw3IEBAIGNsYXNzIFByaW50ZXIob2Jq ZWN0KToKICAgICAgICAgICAgICAgICBicmVhawogCiAgICAgICAgICAgICBuZXh0X3Rlc3QgPSB0 ZXN0X2xpc3Rbc2VsZi5fY3VycmVudF90ZXN0X251bWJlcl0KLSAgICAgICAgICAgIG5leHRfZGly ID0gb3MucGF0aC5kaXJuYW1lKAorICAgICAgICAgICAgbmV4dF9kaXIgPSBzZWxmLl9wb3J0Ll9m aWxlc3lzdGVtLmRpcm5hbWUoCiAgICAgICAgICAgICAgICAgc2VsZi5fcG9ydC5yZWxhdGl2ZV90 ZXN0X2ZpbGVuYW1lKG5leHRfdGVzdCkpCiAKICAgICAgICAgaWYgcmVzdWx0X3N1bW1hcnkucmVt YWluaW5nOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv bGF5b3V0X3BhY2thZ2UvcHJpbnRpbmdfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9wcmludGluZ191bml0dGVzdC5weQppbmRl eCA5MjgwYjAyNTNkN2MyNWU4NzhjNzMwMTgzZWYxZTllNWE3NjE3MTFkLi5jM2ViMDRmYzE3Njcy Y2I0YzUzZDk4OTU5ZTM5N2UxNGIzMDcwNjRjIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9wcmludGluZ191bml0dGVzdC5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9w cmludGluZ191bml0dGVzdC5weQpAQCAtMjksMTAgKzI5LDcgQEAKIAogIiIiVW5pdCB0ZXN0cyBm b3IgcHJpbnRpbmcucHkuIiIiCiAKLWltcG9ydCBvcwogaW1wb3J0IG9wdHBhcnNlCi1pbXBvcnQg cGRiCi1pbXBvcnQgc3lzCiBpbXBvcnQgdW5pdHRlc3QKIGltcG9ydCBsb2dnaW5nCiAKQEAgLTEz OCwxMSArMTM1LDExIEBAIGNsYXNzICBUZXN0cHJpbnRlcih1bml0dGVzdC5UZXN0Q2FzZSk6CiAg ICAgICAgICAgICBmYWlsdXJlcyA9IFt0ZXN0X2ZhaWx1cmVzLkZhaWx1cmVUaW1lb3V0KCldCiAg ICAgICAgIGVsaWYgcmVzdWx0X3R5cGUgPT0gdGVzdF9leHBlY3RhdGlvbnMuQ1JBU0g6CiAgICAg ICAgICAgICBmYWlsdXJlcyA9IFt0ZXN0X2ZhaWx1cmVzLkZhaWx1cmVDcmFzaCgpXQotICAgICAg ICBwYXRoID0gb3MucGF0aC5qb2luKHNlbGYuX3BvcnQubGF5b3V0X3Rlc3RzX2RpcigpLCB0ZXN0 KQorICAgICAgICBwYXRoID0gc2VsZi5fcG9ydC5fZmlsZXN5c3RlbS5qb2luKHNlbGYuX3BvcnQu bGF5b3V0X3Rlc3RzX2RpcigpLCB0ZXN0KQogICAgICAgICByZXR1cm4gdGVzdF9yZXN1bHRzLlRl c3RSZXN1bHQocGF0aCwgZmFpbHVyZXM9ZmFpbHVyZXMsIHRlc3RfcnVuX3RpbWU9cnVuX3RpbWUp CiAKICAgICBkZWYgZ2V0X3Jlc3VsdF9zdW1tYXJ5KHNlbGYsIHRlc3RzLCBleHBlY3RhdGlvbnNf c3RyKToKLSAgICAgICAgdGVzdF9wYXRocyA9IFtvcy5wYXRoLmpvaW4oc2VsZi5fcG9ydC5sYXlv dXRfdGVzdHNfZGlyKCksIHRlc3QpIGZvcgorICAgICAgICB0ZXN0X3BhdGhzID0gW3NlbGYuX3Bv cnQuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLl9wb3J0LmxheW91dF90ZXN0c19kaXIoKSwgdGVzdCkg Zm9yCiAgICAgICAgICAgICAgICAgICAgICAgdGVzdCBpbiB0ZXN0c10KICAgICAgICAgZXhwZWN0 YXRpb25zID0gdGVzdF9leHBlY3RhdGlvbnMuVGVzdEV4cGVjdGF0aW9ucygKICAgICAgICAgICAg IHNlbGYuX3BvcnQsIHRlc3RfcGF0aHMsIGV4cGVjdGF0aW9uc19zdHIsCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS90ZXN0X2V4 cGVjdGF0aW9ucy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91 dF9wYWNrYWdlL3Rlc3RfZXhwZWN0YXRpb25zLnB5CmluZGV4IDg2NDVmYzFkYzE4N2Q2ZGMwNmNm ZmVmYzdlNGI5ODY2YjRlNTBlN2MuLjgwNmI2NjM0NzE4MGE4YzAxYzA4ZmVlZGM4MGIzZmYwMjU1 NTI0NjggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xh eW91dF9wYWNrYWdlL3Rlc3RfZXhwZWN0YXRpb25zLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3Rlc3RfZXhwZWN0YXRpb25zLnB5CkBA IC0zMiw5ICszMiw3IEBAIGZvciBsYXlvdXQgdGVzdHMuCiAiIiIKIAogaW1wb3J0IGxvZ2dpbmcK LWltcG9ydCBvcwogaW1wb3J0IHJlCi1pbXBvcnQgc3lzCiAKIGltcG9ydCB3ZWJraXRweS50aGly ZHBhcnR5LnNpbXBsZWpzb24gYXMgc2ltcGxlanNvbgogCkBAIC0zMjIsNiArMzIwLDcgQEAgY2xh c3MgVGVzdEV4cGVjdGF0aW9uc0ZpbGU6CiAgICAgICAgICIiIgogCiAgICAgICAgIHNlbGYuX3Bv cnQgPSBwb3J0CisgICAgICAgIHNlbGYuX2ZzID0gcG9ydC5fZmlsZXN5c3RlbQogICAgICAgICBz ZWxmLl9leHBlY3RhdGlvbnMgPSBleHBlY3RhdGlvbnMKICAgICAgICAgc2VsZi5fZnVsbF90ZXN0 X2xpc3QgPSBmdWxsX3Rlc3RfbGlzdAogICAgICAgICBzZWxmLl90ZXN0X3BsYXRmb3JtX25hbWUg PSB0ZXN0X3BsYXRmb3JtX25hbWUKQEAgLTY5MCw5ICs2ODksOSBAQCBjbGFzcyBUZXN0RXhwZWN0 YXRpb25zRmlsZToKICAgICAgICAgICAgICAgICAgICAgJ2luZGVmaW5pdGVseSwgdGhlbiBpdCBz aG91bGQgYmUganVzdCB0aW1lb3V0LicsCiAgICAgICAgICAgICAgICAgICAgIHRlc3RfbGlzdF9w YXRoKQogCi0gICAgICAgICAgICBmdWxsX3BhdGggPSBvcy5wYXRoLmpvaW4oc2VsZi5fcG9ydC5s YXlvdXRfdGVzdHNfZGlyKCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dGVzdF9saXN0X3BhdGgpCi0gICAgICAgICAgICBmdWxsX3BhdGggPSBvcy5wYXRoLm5vcm1wYXRo KGZ1bGxfcGF0aCkKKyAgICAgICAgICAgIGZ1bGxfcGF0aCA9IHNlbGYuX2ZzLmpvaW4oc2VsZi5f cG9ydC5sYXlvdXRfdGVzdHNfZGlyKCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHRlc3RfbGlzdF9wYXRoKQorICAgICAgICAgICAgZnVsbF9wYXRoID0gc2VsZi5fZnMu bm9ybXBhdGgoZnVsbF9wYXRoKQogICAgICAgICAgICAgIyBXZWJLaXQncyB3YXkgb2Ygc2tpcHBp bmcgdGVzdHMgaXMgdG8gYWRkIGEgLWRpc2FibGVkIHN1ZmZpeC4KICAgICAgICAgICAgICMgU28g d2Ugc2hvdWxkIGNvbnNpZGVyIHRoZSBwYXRoIGV4aXN0aW5nIGlmIHRoZSBwYXRoIG9yIHRoZQog ICAgICAgICAgICAgIyAtZGlzYWJsZWQgdmVyc2lvbiBleGlzdHMuCkBAIC03MzYsMTEgKzczNSwx MSBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25zRmlsZToKICAgICAgICAgIyBsaXN0cyB0byByZXBy ZXNlbnQgdGhlIHRyZWUgb2YgdGVzdHMsIGxlYXZlcyBiZWluZyB0ZXN0CiAgICAgICAgICMgZmls ZXMgYW5kIG5vZGVzIGJlaW5nIGNhdGVnb3JpZXMuCiAKLSAgICAgICAgcGF0aCA9IG9zLnBhdGgu am9pbihzZWxmLl9wb3J0LmxheW91dF90ZXN0c19kaXIoKSwgdGVzdF9saXN0X3BhdGgpCi0gICAg ICAgIHBhdGggPSBvcy5wYXRoLm5vcm1wYXRoKHBhdGgpCi0gICAgICAgIGlmIHNlbGYuX3BvcnQu cGF0aF9pc2RpcihwYXRoKToKKyAgICAgICAgcGF0aCA9IHNlbGYuX2ZzLmpvaW4oc2VsZi5fcG9y dC5sYXlvdXRfdGVzdHNfZGlyKCksIHRlc3RfbGlzdF9wYXRoKQorICAgICAgICBwYXRoID0gc2Vs Zi5fZnMubm9ybXBhdGgocGF0aCkKKyAgICAgICAgaWYgc2VsZi5fZnMuaXNkaXIocGF0aCk6CiAg ICAgICAgICAgICAjIHRoaXMgaXMgYSB0ZXN0IGNhdGVnb3J5LCByZXR1cm4gYWxsIHRoZSB0ZXN0 cyBvZiB0aGUgY2F0ZWdvcnkuCi0gICAgICAgICAgICBwYXRoID0gb3MucGF0aC5qb2luKHBhdGgs ICcnKQorICAgICAgICAgICAgcGF0aCA9IHNlbGYuX2ZzLmpvaW4ocGF0aCwgJycpCiAKICAgICAg ICAgICAgIHJldHVybiBbdGVzdCBmb3IgdGVzdCBpbiBzZWxmLl9mdWxsX3Rlc3RfbGlzdCBpZiB0 ZXN0LnN0YXJ0c3dpdGgocGF0aCldCiAKQEAgLTgxNyw3ICs4MTYsNyBAQCBjbGFzcyBUZXN0RXhw ZWN0YXRpb25zRmlsZToKICAgICAgICAgICAgIHNlbGYuX3JlbW92ZV9mcm9tX3NldHModGVzdCwg c2VsZi5fdGltZWxpbmVfdG9fdGVzdHMpCiAgICAgICAgICAgICBzZWxmLl9yZW1vdmVfZnJvbV9z ZXRzKHRlc3QsIHNlbGYuX3Jlc3VsdF90eXBlX3RvX3Rlc3RzKQogCi0gICAgICAgIHNlbGYuX3Rl c3RfbGlzdF9wYXRoc1t0ZXN0XSA9IG9zLnBhdGgubm9ybXBhdGgodGVzdF9saXN0X3BhdGgpCisg ICAgICAgIHNlbGYuX3Rlc3RfbGlzdF9wYXRoc1t0ZXN0XSA9IHNlbGYuX2ZzLm5vcm1wYXRoKHRl c3RfbGlzdF9wYXRoKQogCiAgICAgZGVmIF9yZW1vdmVfZnJvbV9zZXRzKHNlbGYsIHRlc3QsIGRp Y3QpOgogICAgICAgICAiIiJSZW1vdmVzIHRoZSBnaXZlbiB0ZXN0IGZyb20gdGhlIHNldHMgaW4g dGhlIGRpY3Rpb25hcnkuCkBAIC04MzgsNyArODM3LDcgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9u c0ZpbGU6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKIAogICAgICAgICBwcmV2X2Jhc2VfcGF0 aCA9IHNlbGYuX3Rlc3RfbGlzdF9wYXRoc1t0ZXN0XQotICAgICAgICBpZiAocHJldl9iYXNlX3Bh dGggPT0gb3MucGF0aC5ub3JtcGF0aCh0ZXN0X2xpc3RfcGF0aCkpOgorICAgICAgICBpZiAocHJl dl9iYXNlX3BhdGggPT0gc2VsZi5fZnMubm9ybXBhdGgodGVzdF9saXN0X3BhdGgpKToKICAgICAg ICAgICAgIGlmIChub3QgYWxsb3dfb3ZlcnJpZGVzIG9yIHRlc3QgaW4gc2VsZi5fb3ZlcnJpZGRp bmdfdGVzdHMpOgogICAgICAgICAgICAgICAgIGlmIGFsbG93X292ZXJyaWRlczoKICAgICAgICAg ICAgICAgICAgICAgZXhwZWN0YXRpb25fc291cmNlID0gIm92ZXJyaWRlIgpAQCAtODU0LDcgKzg1 Myw3IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnNGaWxlOgogICAgICAgICAgICAgICAgIHJldHVy biBGYWxzZQogCiAgICAgICAgICMgQ2hlY2sgaWYgd2UndmUgYWxyZWFkeSBzZWVuIGEgbW9yZSBw cmVjaXNlIHBhdGguCi0gICAgICAgIHJldHVybiBwcmV2X2Jhc2VfcGF0aC5zdGFydHN3aXRoKG9z LnBhdGgubm9ybXBhdGgodGVzdF9saXN0X3BhdGgpKQorICAgICAgICByZXR1cm4gcHJldl9iYXNl X3BhdGguc3RhcnRzd2l0aChzZWxmLl9mcy5ub3JtcGF0aCh0ZXN0X2xpc3RfcGF0aCkpCiAKICAg ICBkZWYgX2FkZF9lcnJvcihzZWxmLCBsaW5lbm8sIG1zZywgcGF0aCk6CiAgICAgICAgICIiIlJl cG9ydHMgYW4gZXJyb3IgdGhhdCB3aWxsIHByZXZlbnQgcnVubmluZyB0aGUgdGVzdHMuIERvZXMg bm90CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlv dXRfcGFja2FnZS90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3Rlc3RfZXhwZWN0YXRpb25zX3Vu aXR0ZXN0LnB5CmluZGV4IDM0NzcxZjMwMzlhZmYxMGEwZmQyMjBlZmE0ODM2NzU1Yzc3MjhlZTMu LjhmOWU1ZGQwYWFhNWM2MzhiYzQzMzcxYWY1YzkwNTliZGFlNTI2ODMgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3Rlc3RfZXhw ZWN0YXRpb25zX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL2xheW91dF9wYWNrYWdlL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5CkBAIC0y OSw4ICsyOSw2IEBACiAKICIiIlVuaXQgdGVzdHMgZm9yIHRlc3RfZXhwZWN0YXRpb25zLnB5LiIi IgogCi1pbXBvcnQgb3MKLWltcG9ydCBzeXMKIGltcG9ydCB1bml0dGVzdAogCiBmcm9tIHdlYmtp dHB5LmxheW91dF90ZXN0cyBpbXBvcnQgcG9ydApAQCAtODIsMTEgKzgwLDEyIEBAIGNsYXNzIEZ1 bmN0aW9uc1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogY2xhc3MgQmFzZSh1bml0dGVzdC5UZXN0 Q2FzZSk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHRlc3RGdW5jLCBzZXRVcD1Ob25lLCB0ZWFy RG93bj1Ob25lLCBkZXNjcmlwdGlvbj1Ob25lKToKICAgICAgICAgc2VsZi5fcG9ydCA9IHBvcnQu Z2V0KCd0ZXN0JywgTm9uZSkKKyAgICAgICAgc2VsZi5fZnMgPSBzZWxmLl9wb3J0Ll9maWxlc3lz dGVtCiAgICAgICAgIHNlbGYuX2V4cCA9IE5vbmUKICAgICAgICAgdW5pdHRlc3QuVGVzdENhc2Uu X19pbml0X18oc2VsZiwgdGVzdEZ1bmMpCiAKICAgICBkZWYgZ2V0X3Rlc3Qoc2VsZiwgdGVzdF9u YW1lKToKLSAgICAgICAgcmV0dXJuIG9zLnBhdGguam9pbihzZWxmLl9wb3J0LmxheW91dF90ZXN0 c19kaXIoKSwgdGVzdF9uYW1lKQorICAgICAgICByZXR1cm4gc2VsZi5fZnMuam9pbihzZWxmLl9w b3J0LmxheW91dF90ZXN0c19kaXIoKSwgdGVzdF9uYW1lKQogCiAgICAgZGVmIGdldF9iYXNpY190 ZXN0cyhzZWxmKToKICAgICAgICAgcmV0dXJuIFtzZWxmLmdldF90ZXN0KCdmYWlsdXJlcy9leHBl Y3RlZC90ZXh0Lmh0bWwnKSwKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3Rlc3RfZmFpbHVyZXMucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS90ZXN0X2ZhaWx1cmVzLnB5Cmlu ZGV4IDJiODE5MGI1ZmM0N2E2ZTViZDU5YjQyZTQyYmYwYzU1ZTYyNjRlMjMuLjVhZDJlMDRjZTFk NTQ5Y2FlY2U5M2ViOWZiYjJmNjc1MWViMjg4Y2MgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3Rlc3RfZmFpbHVyZXMucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVz dF9mYWlsdXJlcy5weQpAQCAtMjksNyArMjksNiBAQAogCiAiIiJDbGFzc2VzIGZvciBmYWlsdXJl cyB0aGF0IG9jY3VyIGR1cmluZyB0ZXN0cy4iIiIKIAotaW1wb3J0IG9zCiBpbXBvcnQgdGVzdF9l eHBlY3RhdGlvbnMKIAogaW1wb3J0IGNQaWNrbGUKQEAgLTEyMSw3ICsxMjAsMTAgQEAgY2xhc3Mg VGVzdEZhaWx1cmUob2JqZWN0KToKICAgICAgICAgUmV0dXJuOgogICAgICAgICAgIFRoZSByZWxh dGl2ZSB3aW5kb3dzIHBhdGggdG8gdGhlIG91dHB1dCBmaWxlbmFtZQogICAgICAgICAiIiIKLSAg ICAgICAgcmV0dXJuIG9zLnBhdGguc3BsaXRleHQoZmlsZW5hbWUpWzBdICsgbW9kaWZpZXIKKyAg ICAgICAgIyBGSVhNRTogdGVjaG5pY2FsbHkgdGhpcyBicmVha3MgaWYgZmlsZXMgZG9uJ3QgdXNl ICIuZXh0IiB0byBpbmRpY2F0ZQorICAgICAgICAjIHRoZSBleHRlbnNpb24sIGJ1dCBwYXNzaW5n IGluIGEgRmlsZXN5c3RlbSBvYmplY3QgaGVyZSBpcyBhIGh1Z2UKKyAgICAgICAgIyBoYXNzbGUu CisgICAgICAgIHJldHVybiBmaWxlbmFtZVtmaWxlbmFtZS5yZmluZCgnLicpXSArIG1vZGlmaWVy CiAKIAogY2xhc3MgRmFpbHVyZVdpdGhUeXBlKFRlc3RGYWlsdXJlKToKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvdGV4dF9kaWZmLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdGVzdF90eXBlcy90ZXh0X2Rp ZmYucHkKaW5kZXggYWQyNTI2MjlkM2ViN2FmNjUwZDNiYjI1MWI3ZTI0YzM1N2Y4NmJiOS4uN2I3 ZmViZTA1YmI3MTMwYzJhMTdjOTliYWUwZmZjZDZkODQzOWE5NiAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdGVzdF90eXBlcy90ZXh0X2RpZmYucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdGVzdF90eXBlcy90ZXh0X2Rp ZmYucHkKQEAgLTMzLDEyICszMyw4IEBAIElmIHRoZSBvdXRwdXQgZG9lc24ndCBtYXRjaCwgcmV0 dXJucyBGYWlsdXJlVGV4dE1pc21hdGNoIGFuZCBvdXRwdXRzIHRoZSBkaWZmCiBmaWxlcyBpbnRv IHRoZSBsYXlvdXQgdGVzdCByZXN1bHRzIGRpcmVjdG9yeS4KICIiIgogCi1mcm9tIF9fZnV0dXJl X18gaW1wb3J0IHdpdGhfc3RhdGVtZW50Ci0KLWltcG9ydCBjb2RlY3MKIGltcG9ydCBlcnJubwog aW1wb3J0IGxvZ2dpbmcKLWltcG9ydCBvcy5wYXRoCiAKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rl c3RzLmxheW91dF9wYWNrYWdlIGltcG9ydCB0ZXN0X2ZhaWx1cmVzCiBmcm9tIHdlYmtpdHB5Lmxh eW91dF90ZXN0cy50ZXN0X3R5cGVzIGltcG9ydCB0ZXN0X3R5cGVfYmFzZQo=