613109 unknown 2010-11-17 17:50:29 -0800 Make it possible to run a mochitest-* test suite with an extension installed 2011-04-02 17:43:23 -0700 1 1 3 Components Testing Mochitest Trunk All All defect RESOLVED FIXED -- normal mozilla5 573263 642983 647394 1 ehsan.akhgari ehsan.akhgari dbolter dtownsend ehsan.akhgari gavin.sharp khuey ted --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ? --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- 2011-03-23 21:49:27 --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- 2011-03-23 21:49:27 0 5089813 ehsan.akhgari 2010-11-17 17:50:29 -0800 It would be really helpful to add a command line option to runtests.py to install an xpi file in the profile folder as a usable extension. This will give us the ability to, for example, run a test with Firebug installed, which sometimes could save us hours of desperate printf debugging. Another useful extension for this purpose is DOM Inspector, but I guess the command line option could be capable of installing any extension. 5090754 ted 2010-11-18 08:19:13 -0800 There is --extra-profile-file=foo, which you can use to copy random things into the profile. I don't know that copying a .xpi will work. automation.py has an installExtension method that would definitely work (we use it to install the reftest bits): http://mxr.mozilla.org/mozilla-central/source/build/automation.py.in#913 we just don't currently expose that as a cmdline option. Would be easy enough to fix that. 5090863 ehsan.akhgari 2010-11-18 09:03:32 -0800 (In reply to comment #1) > There is --extra-profile-file=foo, which you can use to copy random things into > the profile. I don't know that copying a .xpi will work. Mossop, do you know if it will work? > automation.py has an installExtension method that would definitely work (we use > it to install the reftest bits): > http://mxr.mozilla.org/mozilla-central/source/build/automation.py.in#913 Hmm, I also found <http://mxr.mozilla.org/mozilla-central/source/layout/tools/reftest/runreftest.py#106> (registerExtension). Is that also needed ater installExtension? Also, the docs for installExtension say: Copies an "installed" extension into the extensions directory of the given profile What does "installed" mean in this context? > we just don't currently expose that as a cmdline option. Would be easy enough > to fix that. Given the information above, I may give that a go! Should I add the command line handling stuff in automation.py? 5090885 ted 2010-11-18 09:14:06 -0800 The registerExtension bit should no longer be necessary on trunk, since we don't require restarts. The docstring there might just be out-of-date, I think it used to only support unpacked directories, but it clearly supports .xpi files now. If you add the cmdline stuff in automation.py, we can use it in both Mochitest and Refest, but that means you'll have to do a little bit of implementation in both harnesses. 5090963 dtownsend 2010-11-18 09:41:29 -0800 (In reply to comment #2) > (In reply to comment #1) > > There is --extra-profile-file=foo, which you can use to copy random things into > > the profile. I don't know that copying a .xpi will work. > > Mossop, do you know if it will work? Just copying the raw XPI (naming it <id>.xpi) or the unpacked files from the xpi (in a directory named <id>) into <profile>/extensions should be all you need to do these days 5092146 ehsan.akhgari 2010-11-18 15:25:36 -0800 So I made some changes to runtests.py.in and then did both of these: make -C objdir/testing/mochitest make -f client.mk build And my changes have not yet been picked up in objdir/_test/testing/mochitest/runtests.py. How can I correctly make the build system pick up my changes without blowing away my entire objdir? 5097624 gavin.sharp 2010-11-22 05:58:33 -0800 There is no runtests.py.in anymore, since bug 576026. Are you editing the wrong thing? The mochitest/testing makefile should just be copying it into objdir/_tests/ directly. 5340827 518906 ehsan.akhgari 2011-03-11 20:24:59 -0800 Created attachment 518906 Patch (v1) I almost forgot that I still have this in my queue! This patch adds the --install-extension command line argument to runtests.py. I've tested this for example to install Firebug in a mochitest profile. Here's a sample command line that one should use: python obj-ff-dbg/_tests/testing/mochitest/runtests.py --test-path=editor/libeditor/html/tests/test_bug635636.html --install-extension=firebug@software.joehewitt.com.xpi I think this is going to be very useful for a lot of developers, so let's try to get it in the tree! 5343687 518906 ehsan.akhgari 2011-03-14 11:08:40 -0700 Comment on attachment 518906 Patch (v1) ...and this time I forgot to set the requestee! :-) 5343775 518906 khuey 2011-03-14 11:35:03 -0700 Comment on attachment 518906 Patch (v1) Going to punt this to ted since test harnesses aren't really my area. 5343776 518906 ted 2011-03-14 11:35:11 -0700 Comment on attachment 518906 Patch (v1) The unittest harnesses aren't in the build config module, FWIW. 5349109 ehsan.akhgari 2011-03-16 12:22:33 -0700 (In reply to comment #10) > Comment on attachment 518906 [details] > Patch (v1) > > The unittest harnesses aren't in the build config module, FWIW. Does that mean that I should ask somebody else to review this? I looked at <http://hg.mozilla.org/mozilla-central/log/tip/testing/mochitest/runtests.py> and I thought that Kyle might be less busy than you. You guys are the only people who have reviewed that code... 5353454 518906 ted 2011-03-18 09:21:24 -0700 Comment on attachment 518906 Patch (v1) It might be worthwhile to refactor some of this up into automation.py. There's an addCommonOptions function there for commandline options. 5353455 ted 2011-03-18 09:22:24 -0700 And yeah, khuey is only listed as a reviewer there on a patch that renamed the file from .py.in to .py. We should probably get the unit test harness module ownership sorted out for real. 5354044 ehsan.akhgari 2011-03-18 12:43:19 -0700 (In reply to comment #12) > It might be worthwhile to refactor some of this up into automation.py. There's > an addCommonOptions function there for commandline options. Can this be done in a follow-up? 5354060 ted 2011-03-18 12:48:47 -0700 Sure, as long as you file it before landing. :) 5354303 ehsan.akhgari 2011-03-18 14:15:57 -0700 Sure, filed bug 642983. 5363958 ehsan.akhgari 2011-03-23 14:49:27 -0700 http://hg.mozilla.org/mozilla-central/rev/e4311825a9c7 518906 2011-03-11 20:24:59 -0800 2011-03-18 09:21:24 -0700 Patch (v1) 613109.patch text/plain 6028 ehsan.akhgari IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIEVoc2FuIEFraGdhcmkgPGVoc2FuQG1vemlsbGEu Y29tPgojIERhdGUgMTI5MDExODU1NCAxODAwMAojIE5vZGUgSUQgNDU4YTc0NTNlOTI1YWYwNjY5 MjE1NTAzZjQxYzgyYTRhOTFmMzQ4YgojIFBhcmVudCAgYThiNmVhYWVkY2UyNzU1YzQ3NTNlYTNl MTkwMzkzMzViNGZlMDVhMApCdWcgNjEzMTA5IC0gTWFrZSBpdCBwb3NzaWJsZSB0byBydW4gYSBt b2NoaXRlc3QtKiB0ZXN0IHN1aXRlIHdpdGggYW4gZXh0ZW5zaW9uIGluc3RhbGxlZAoKZGlmZiAt LWdpdCBhL2xheW91dC90b29scy9yZWZ0ZXN0L3J1bnJlZnRlc3QucHkgYi9sYXlvdXQvdG9vbHMv cmVmdGVzdC9ydW5yZWZ0ZXN0LnB5Ci0tLSBhL2xheW91dC90b29scy9yZWZ0ZXN0L3J1bnJlZnRl c3QucHkKKysrIGIvbGF5b3V0L3Rvb2xzL3JlZnRlc3QvcnVucmVmdGVzdC5weQpAQCAtMTM0LDE2 ICsxMzQsMTcgQEAgY2xhc3MgUmVmVGVzdChvYmplY3QpOgogICAgIGRlYnVnZ2VySW5mbyA9IGdl dERlYnVnZ2VySW5mbyhzZWxmLm9sZGN3ZCwgb3B0aW9ucy5kZWJ1Z2dlciwgb3B0aW9ucy5kZWJ1 Z2dlckFyZ3MsCiAgICAgICAgIG9wdGlvbnMuZGVidWdnZXJJbnRlcmFjdGl2ZSk7CiAKICAgICBw cm9maWxlRGlyID0gTm9uZQogICAgIHRyeToKICAgICAgIHByb2ZpbGVEaXIgPSBta2R0ZW1wKCkK ICAgICAgIHNlbGYuY3JlYXRlUmVmdGVzdFByb2ZpbGUob3B0aW9ucywgcHJvZmlsZURpcikKICAg ICAgIHNlbGYuY29weUV4dHJhRmlsZXNUb1Byb2ZpbGUob3B0aW9ucywgcHJvZmlsZURpcikKKyAg ICAgIHNlbGYuaW5zdGFsbEV4dGVuc2lvbnNUb1Byb2ZpbGUob3B0aW9ucywgcHJvZmlsZURpcikK IAogICAgICAgIyBicm93c2VyIGVudmlyb25tZW50CiAgICAgICBicm93c2VyRW52ID0gc2VsZi5i dWlsZEJyb3dzZXJFbnYob3B0aW9ucywgcHJvZmlsZURpcikKIAogICAgICAgc2VsZi5yZWdpc3Rl ckV4dGVuc2lvbihicm93c2VyRW52LCBvcHRpb25zLCBwcm9maWxlRGlyKQogCiAgICAgICAjIHRo ZW4gYWdhaW4gdG8gYWN0dWFsbHkgcnVuIHJlZnRlc3QKICAgICAgIHNlbGYuYXV0b21hdGlvbi5s b2cuaW5mbygiUkVGVEVTVCBJTkZPIHwgcnVucmVmdGVzdC5weSB8IFJ1bm5pbmcgdGVzdHM6IHN0 YXJ0LlxuIikKQEAgLTE2OCwxNiArMTY5LDIzIEBAIGNsYXNzIFJlZlRlc3Qob2JqZWN0KToKICAg ICBmb3IgZiBpbiBvcHRpb25zLmV4dHJhUHJvZmlsZUZpbGVzOgogICAgICAgYWJzcGF0aCA9IHNl bGYuZ2V0RnVsbFBhdGgoZikKICAgICAgIGRlc3QgPSBvcy5wYXRoLmpvaW4ocHJvZmlsZURpciwg b3MucGF0aC5iYXNlbmFtZShhYnNwYXRoKSkKICAgICAgIGlmIG9zLnBhdGguaXNkaXIoYWJzcGF0 aCk6CiAgICAgICAgIHNodXRpbC5jb3B5dHJlZShhYnNwYXRoLCBkZXN0KQogICAgICAgZWxzZToK ICAgICAgICAgc2h1dGlsLmNvcHkoYWJzcGF0aCwgZGVzdCkKIAorICBkZWYgaW5zdGFsbEV4dGVu c2lvbnNUb1Byb2ZpbGUoc2VsZiwgb3B0aW9ucywgcHJvZmlsZURpcik6CisgICAgIkluc3RhbGwg dGhlIHNwZWNpZmllZCBleHRlbnNpb25zIG9uIHRoZSBjb21tYW5kIGxpbmUgdG8gdGhlIHRlc3Rp bmcgcHJvZmlsZS4iCisgICAgZm9yIGYgaW4gb3B0aW9ucy5leHRlbnNpb25zVG9JbnN0YWxsOgor ICAgICAgYWJzcGF0aCA9IHNlbGYuZ2V0RnVsbFBhdGgoZikKKyAgICAgIGV4dGVuc2lvbklEID0g Zls6Zi5yZmluZCgiLiIpXQorICAgICAgc2VsZi5hdXRvbWF0aW9uLmluc3RhbGxFeHRlbnNpb24o YWJzcGF0aCwgcHJvZmlsZURpciwgZXh0ZW5zaW9uSUQpCisKIAogY2xhc3MgUmVmdGVzdE9wdGlv bnMoT3B0aW9uUGFyc2VyKToKIAogICBkZWYgX19pbml0X18oc2VsZiwgYXV0b21hdGlvbik6CiAg ICAgc2VsZi5fYXV0b21hdGlvbiA9IGF1dG9tYXRpb24KICAgICBPcHRpb25QYXJzZXIuX19pbml0 X18oc2VsZikKICAgICBkZWZhdWx0cyA9IHt9CiAKQEAgLTIyOCwxNiArMjM2LDIzIEBAIGNsYXNz IFJlZnRlc3RPcHRpb25zKE9wdGlvblBhcnNlcik6CiAgICAgICAgICAgICAgICAgICAgIGhlbHAg PSAiZmlsZSB0byBsb2cgb3V0cHV0IHRvIGluIGFkZGl0aW9uIHRvIHN0ZG91dCIpCiAgICAgZGVm YXVsdHNbImxvZ0ZpbGUiXSA9IE5vbmUKICAKICAgICBzZWxmLmFkZF9vcHRpb24oIi0tc2tpcC1z bG93LXRlc3RzIiwKICAgICAgICAgICAgICAgICAgICAgZGVzdCA9ICJza2lwU2xvd1Rlc3RzIiwg YWN0aW9uID0gInN0b3JlX3RydWUiLAogICAgICAgICAgICAgICAgICAgICBoZWxwID0gInNraXAg dGVzdHMgbWFya2VkIGFzIHNsb3cgd2hlbiBydW5uaW5nIikKICAgICBkZWZhdWx0c1sic2tpcFNs b3dUZXN0cyJdID0gRmFsc2UKIAorICAgIHNlbGYuYWRkX29wdGlvbigiLS1pbnN0YWxsLWV4dGVu c2lvbiIsCisgICAgICAgICAgICAgICAgICAgIGFjdGlvbiA9ICJhcHBlbmQiLCBkZXN0ID0gImV4 dGVuc2lvbnNUb0luc3RhbGwiLAorICAgICAgICAgICAgICAgICAgICBoZWxwID0gImluc3RhbGwg dGhlIHNwZWNpZmllZCBleHRlbnNpb24gaW4gdGhlIHRlc3RpbmcgcHJvZmlsZS4iCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAiVGhlIGV4dGVuc2lvbiBmaWxlJ3MgbmFtZSBzaG91bGQgYmUg PGlkPi54cGkgd2hlcmUgPGlkPiBpcyIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICJ0aGUg ZXh0ZW5zaW9uJ3MgaWQgYXMgaW5kaWNhdGVkIGluIGl0cyBpbnN0YWxsLnJkZi4iKQorICAgIGRl ZmF1bHRzWyJleHRlbnNpb25zVG9JbnN0YWxsIl0gPSBbXQorCiAgICAgc2VsZi5zZXRfZGVmYXVs dHMoKipkZWZhdWx0cykKIAogZGVmIG1haW4oKToKICAgYXV0b21hdGlvbiA9IEF1dG9tYXRpb24o KQogICBwYXJzZXIgPSBSZWZ0ZXN0T3B0aW9ucyhhdXRvbWF0aW9uKQogICByZWZ0ZXN0ID0gUmVm VGVzdChhdXRvbWF0aW9uKQogCiAgIG9wdGlvbnMsIGFyZ3MgPSBwYXJzZXIucGFyc2VfYXJncygp CmRpZmYgLS1naXQgYS90ZXN0aW5nL21vY2hpdGVzdC9ydW50ZXN0cy5weSBiL3Rlc3RpbmcvbW9j aGl0ZXN0L3J1bnRlc3RzLnB5Ci0tLSBhL3Rlc3RpbmcvbW9jaGl0ZXN0L3J1bnRlc3RzLnB5Cisr KyBiL3Rlc3RpbmcvbW9jaGl0ZXN0L3J1bnRlc3RzLnB5CkBAIC0yMDIsMTYgKzIwMiwyMyBAQCBj bGFzcyBNb2NoaXRlc3RPcHRpb25zKG9wdHBhcnNlLk9wdGlvblBhCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAiKHJlcXVpcmVzIGEgZGVidWcgYnVpbGQgdG8gYmUgZWZmZWN0aXZlKSIpCiAg ICAgZGVmYXVsdHNbImZhdGFsQXNzZXJ0aW9ucyJdID0gRmFsc2UKIAogICAgIHNlbGYuYWRkX29w dGlvbigiLS1leHRyYS1wcm9maWxlLWZpbGUiLAogICAgICAgICAgICAgICAgICAgICBhY3Rpb24g PSAiYXBwZW5kIiwgZGVzdCA9ICJleHRyYVByb2ZpbGVGaWxlcyIsCiAgICAgICAgICAgICAgICAg ICAgIGhlbHAgPSAiY29weSBzcGVjaWZpZWQgZmlsZXMvZGlycyB0byB0ZXN0aW5nIHByb2ZpbGUi KQogICAgIGRlZmF1bHRzWyJleHRyYVByb2ZpbGVGaWxlcyJdID0gW10KIAorICAgIHNlbGYuYWRk X29wdGlvbigiLS1pbnN0YWxsLWV4dGVuc2lvbiIsCisgICAgICAgICAgICAgICAgICAgIGFjdGlv biA9ICJhcHBlbmQiLCBkZXN0ID0gImV4dGVuc2lvbnNUb0luc3RhbGwiLAorICAgICAgICAgICAg ICAgICAgICBoZWxwID0gImluc3RhbGwgdGhlIHNwZWNpZmllZCBleHRlbnNpb24gaW4gdGhlIHRl c3RpbmcgcHJvZmlsZS4iCisgICAgICAgICAgICAgICAgICAgICAgICAgICAiVGhlIGV4dGVuc2lv biBmaWxlJ3MgbmFtZSBzaG91bGQgYmUgPGlkPi54cGkgd2hlcmUgPGlkPiBpcyIKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICJ0aGUgZXh0ZW5zaW9uJ3MgaWQgYXMgaW5kaWNhdGVkIGluIGl0 cyBpbnN0YWxsLnJkZi4iKQorICAgIGRlZmF1bHRzWyJleHRlbnNpb25zVG9JbnN0YWxsIl0gPSBb XQorCiAgICAgc2VsZi5hZGRfb3B0aW9uKCItLXByb2ZpbGUtcGF0aCIsIGFjdGlvbiA9ICJzdG9y ZSIsCiAgICAgICAgICAgICAgICAgICAgIHR5cGUgPSAic3RyaW5nIiwgZGVzdCA9ICJwcm9maWxl UGF0aCIsCiAgICAgICAgICAgICAgICAgICAgIGhlbHAgPSAiRGlyZWN0b3J5IHdoZXJlIHRoZSBw cm9maWxlIHdpbGwgYmUgc3RvcmVkLiIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICJUaGlz IGRpcmVjdG9yeSB3aWxsIGJlIGRlbGV0ZWQgYWZ0ZXIgdGhlIHRlc3RzIGFyZSBmaW5pc2hlZCIp CiAgICAgZGVmYXVsdHNbInByb2ZpbGVQYXRoIl0gPSB0ZW1wZmlsZS5ta2R0ZW1wKCkKIAogICAg IHNlbGYuYWRkX29wdGlvbigiLS11c2Utdm13YXJlLXJlY29yZGluZyIsCiAgICAgICAgICAgICAg ICAgICAgIGFjdGlvbiA9ICJzdG9yZV90cnVlIiwgZGVzdCA9ICJ2bXdhcmVSZWNvcmRpbmciLApA QCAtNDg4LDE2ICs0OTUsMTcgQEAgY2xhc3MgTW9jaGl0ZXN0KG9iamVjdCk6CiAgICAgc2VsZi5j b3B5RXh0cmFGaWxlc1RvUHJvZmlsZShvcHRpb25zKQogCiAgICAgIyBXZSBvbmx5IG5lZWQgc3Bl Y2lhbCBwb3dlcnMgaW4gbm9uLWNocm9tZSBoYXJuZXNzZXMKICAgICBpZiAobm90IG9wdGlvbnMu YnJvd3NlckNocm9tZSBhbmQKICAgICAgICAgbm90IG9wdGlvbnMuY2hyb21lIGFuZAogICAgICAg ICBub3Qgb3B0aW9ucy5hMTF5KToKICAgICAgIHNlbGYuaW5zdGFsbFNwZWNpYWxQb3dlcnNFeHRl bnNpb24ob3B0aW9ucykKIAorICAgIHNlbGYuaW5zdGFsbEV4dGVuc2lvbnNUb1Byb2ZpbGUob3B0 aW9ucykKICAgICByZXR1cm4gbWFuaWZlc3QKIAogICBkZWYgYnVpbGRCcm93c2VyRW52KHNlbGYs IG9wdGlvbnMpOgogICAgICIiIiBidWlsZCB0aGUgZW52aXJvbm1lbnQgdmFyaWFibGVzIGZvciB0 aGUgc3BlY2lmaWMgdGVzdCBhbmQgb3BlcmF0aW5nIHN5c3RlbSAiIiIKICAgICBicm93c2VyRW52 ID0gc2VsZi5hdXRvbWF0aW9uLmVudmlyb25tZW50KHhyZVBhdGggPSBvcHRpb25zLnhyZVBhdGgp CiAKICAgICAjIFRoZXNlIHZhcmlhYmxlcyBhcmUgbmVjZXNzYXJ5IGZvciBjb3JyZWN0IGFwcGxp Y2F0aW9uIHN0YXJ0dXA7IGNoYW5nZQogICAgICMgdmlhIHRoZSBjb21tYW5kbGluZSBhdCB5b3Vy IG93biByaXNrLgpAQCAtNzU1LDE2ICs3NjMsMjMgQEAgb3ZlcmxheSBjaHJvbWU6Ly9icm93c2Vy L2NvbnRlbnQvYnJvd3NlcgogICAgIGZvciBmIGluIG9wdGlvbnMuZXh0cmFQcm9maWxlRmlsZXM6 CiAgICAgICBhYnNwYXRoID0gc2VsZi5nZXRGdWxsUGF0aChmKQogICAgICAgZGVzdCA9IG9zLnBh dGguam9pbihvcHRpb25zLnByb2ZpbGVQYXRoLCBvcy5wYXRoLmJhc2VuYW1lKGFic3BhdGgpKQog ICAgICAgaWYgb3MucGF0aC5pc2RpcihhYnNwYXRoKToKICAgICAgICAgc2h1dGlsLmNvcHl0cmVl KGFic3BhdGgsIGRlc3QpCiAgICAgICBlbHNlOgogICAgICAgICBzaHV0aWwuY29weShhYnNwYXRo LCBkZXN0KQogCisgIGRlZiBpbnN0YWxsRXh0ZW5zaW9uc1RvUHJvZmlsZShzZWxmLCBvcHRpb25z KToKKyAgICAiSW5zdGFsbCB0aGUgc3BlY2lmaWVkIGV4dGVuc2lvbnMgb24gdGhlIGNvbW1hbmQg bGluZSB0byB0aGUgdGVzdGluZyBwcm9maWxlLiIKKyAgICBmb3IgZiBpbiBvcHRpb25zLmV4dGVu c2lvbnNUb0luc3RhbGw6CisgICAgICBhYnNwYXRoID0gc2VsZi5nZXRGdWxsUGF0aChmKQorICAg ICAgZXh0ZW5zaW9uSUQgPSBmWzpmLnJmaW5kKCIuIildCisgICAgICBzZWxmLmF1dG9tYXRpb24u aW5zdGFsbEV4dGVuc2lvbihhYnNwYXRoLCBvcHRpb25zLnByb2ZpbGVQYXRoLCBleHRlbnNpb25J RCkKKwogZGVmIG1haW4oKToKICAgYXV0b21hdGlvbiA9IEF1dG9tYXRpb24oKQogICBtb2NoaXRl c3QgPSBNb2NoaXRlc3QoYXV0b21hdGlvbikKICAgcGFyc2VyID0gTW9jaGl0ZXN0T3B0aW9ucyhh dXRvbWF0aW9uLCBtb2NoaXRlc3QuU0NSSVBUX0RJUkVDVE9SWSkKICAgb3B0aW9ucywgYXJncyA9 IHBhcnNlci5wYXJzZV9hcmdzKCkKIAogICBvcHRpb25zID0gcGFyc2VyLnZlcmlmeU9wdGlvbnMo b3B0aW9ucywgbW9jaGl0ZXN0KQogICBpZiBvcHRpb25zID09IE5vbmU6Cg==