113191 2013-03-25 06:04:22 -0700 master.cfg fine-tuning for Qt Mountain Lion Release bot 2013-04-02 23:53:01 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 113287 1 ossy ossy lforschler mrowe ossy rafael.lobo rniwa zeno oldest_to_newest 862684 0 ossy 2013-03-25 06:04:22 -0700 Qt Mountain Lion Release will be changed soon. Previously it was a build-only save, but we'd like to have a build and WebKit2 tester slave instead of it. The new slave have been working fine here for ~2.5 months: http://build.webkit.sed.hu/builders/x86-64%20Mountain%20Lion%20Qt%20Release%20%28WebGL%20Tester%29 It needs some minor master.cfg changes, so patch is coming soon. 862697 1 194837 ossy 2013-03-25 06:25:35 -0700 Created attachment 194837 Patch 862700 2 194837 ossy 2013-03-25 06:29:46 -0700 Comment on attachment 194837 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=194837&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/config.json:47 > - { "name": "indt-mountainlion", "platform": "qt-mac"}, > + { "name": "oslo-mountainlion", "platform": "qt-5.0-mac-wk2"}, The builder name changes because of the bot location change. Lucas, could you change the builder name in password.json too, please? 862701 3 194839 ossy 2013-03-25 06:31:40 -0700 Created attachment 194839 Patch 862703 4 ossy 2013-03-25 06:34:41 -0700 note: When touching the master.cfg, I found some annoying whitespaces and outdated platform infos for Qt bots - https://bugs.webkit.org/show_bug.cgi?id=113195 I fixed them too and it would be great landing the 2 patches in one shot to avoid too frequent master restart. 862815 5 lforschler 2013-03-25 09:02:13 -0700 I was out on vacation last week. Do you still need me to update the password.json file? If so, I will be in the office later today. 862863 6 ossy 2013-03-25 09:53:51 -0700 (In reply to comment #5) > I was out on vacation last week. Do you still need me to update the password.json file? If so, I will be in the office later today. Yes, it is a brand new bug, I filed it ~3 hours before. :) But it would be great to synchronize the password.json update with landing the proposed patch not to cause problem for build.webkit.org 862901 7 lforschler 2013-03-25 10:49:53 -0700 I've changed indt-mountainlion to oslo-mountainlion in the passwords.json file. this should be picked up when the master is restarted. 862932 8 194839 rniwa 2013-03-25 11:23:00 -0700 Comment on attachment 194839 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=194839&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:607 > + if self.getProperty('fullPlatform').endswith("-wk2"): > + testDirectory = "WebKitBuild/%s/Source/WebKit2/UIProcess/API/qt/tests/" % self.getProperty('configuration').title() > + else: > + testDirectory = "WebKitBuild/%s/Source/WebKit/qt/tests/" % self.getProperty('configuration').title() > + Can we do this detection in run-qtwebkit-tests instead? > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:870 > > +class BuildAndTestWebKit2Factory(BuildAndTestFactory): > + CompileClass = CompileWebKit > + TestClass = RunWebKit2Tests > + We try to use PEP8 style, which means we want to spaces between class declarations. 862942 9 ossy 2013-03-25 11:33:03 -0700 (In reply to comment #8) > (From update of attachment 194839 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=194839&action=review > > > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:607 > > + if self.getProperty('fullPlatform').endswith("-wk2"): > > + testDirectory = "WebKitBuild/%s/Source/WebKit2/UIProcess/API/qt/tests/" % self.getProperty('configuration').title() > > + else: > > + testDirectory = "WebKitBuild/%s/Source/WebKit/qt/tests/" % self.getProperty('configuration').title() > > + > > Can we do this detection in run-qtwebkit-tests instead? Good point. :) I think it would make run-qtwebkit-tests more user friendly. > > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:870 > > > > +class BuildAndTestWebKit2Factory(BuildAndTestFactory): > > + CompileClass = CompileWebKit > > + TestClass = RunWebKit2Tests > > + > > We try to use PEP8 style, which means we want to spaces between class declarations. Correct. Will fix. It seems there are many similar bug in master.cfg. Shall I fix them in a separated bug? For example in https://bugs.webkit.org/show_bug.cgi?id=113195? 862946 10 rniwa 2013-03-25 11:39:37 -0700 Personally, I don't really care about blank lines and other random PEP8 style requirements. 863522 11 195051 ossy 2013-03-26 03:45:26 -0700 Created attachment 195051 Patch 863523 12 ossy 2013-03-26 03:46:15 -0700 (In reply to comment #11) > Created an attachment (id=195051) [details] > Patch It can be landed after the patch landed from https://bugs.webkit.org/show_bug.cgi?id=113287 863653 13 195051 buildbot 2013-03-26 07:28:36 -0700 Comment on attachment 195051 Patch Attachment 195051 did not pass win-ews (win): Output: http://webkit-commit-queue.appspot.com/results/17220945 863657 14 195051 ossy 2013-03-26 07:30:32 -0700 Comment on attachment 195051 Patch remove cq-, this patch can't break a layout test on Windows. :) 864579 15 195051 ossy 2013-03-27 08:42:45 -0700 Comment on attachment 195051 Patch Clearing flags on attachment: 195051 Committed r146989: <http://trac.webkit.org/changeset/146989> 864580 16 ossy 2013-03-27 08:42:50 -0700 All reviewed patches have been landed. Closing bug. 864585 17 ossy 2013-03-27 08:50:47 -0700 It seem build.webkit.org automatic restart doesn't work now. Could you restart it, please? 868481 18 rniwa 2013-04-02 23:53:01 -0700 (In reply to comment #17) > It seem build.webkit.org automatic restart doesn't work now. Could you restart it, please? Done that. 194837 2013-03-25 06:25:35 -0700 2013-03-25 06:31:36 -0700 Patch bug-113191-20130325142223.patch text/plain 4912 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NzU4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTA0OTFkYjkwMDVjZWE1NmY4ZTBiOTczOWQzZWIzZTQy YzQ5YjVhZS4uYjFlOGJlMWE5ZTdlMWFiZjMwOWJhYmY0MGZiODgwNmZlMzBjNzJmMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDEzLTAzLTI1ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisK KyAgICAgICAgbWFzdGVyLmNmZyBmaW5lLXR1bmluZyBmb3IgUXQgTW91bnRhaW4gTGlvbiBSZWxl YXNlIGJvdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTEzMTkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9jb25maWcuanNvbjoK KyAgICAgICAgICAtIFJlbmFtZSB0aGUgc2xhdmUgZHVlIHRvIGl0cyBsb2NhdGlvbiBjaGFuZ2Uu CisgICAgICAgICAgLSBVcGRhdGUgdGhlIHBsYXRmb3JtIG9mIHRoZSBzbGF2ZS4KKyAgICAgICAg KiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnOgor ICAgICAgICAoUnVuUXRBUElUZXN0cyk6IEVuYWJsZSBydW5uaW5nIFdLMiBBUEkgdGVzdHMgb24g UXQuCisgICAgICAgIChSdW5RdEFQSVRlc3RzLnN0YXJ0KToKKyAgICAgICAgKFJ1bldlYktpdDJU ZXN0cy5zdGFydCk6IEZvcmNlIHBpeGVsIHRlc3RzIG9uIHRoZSBRdCBNb3VudGFpbiBMaW9uIFJl bGVhc2UgYnVpbGRlci4KKyAgICAgICAgKEJ1aWxkQW5kVGVzdFdlYktpdDJGYWN0b3J5KTogQWRk ZWQuIChCdWlsZCBXSzEgYW5kIFdLMiB0b28sIGJ1dCBydW4gb25seSBXSzIgdGVzdHMuKQorCiAy MDEzLTAzLTIyICBLaXJhbiBNdXBwYWxhICA8Y211cHBhbGFAYXBwbGUuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQuICBNb3ZlIHNlbGYgZnJvbSBjb250cmlidXRvciB0byBjb21taXR0ZXIgbGlz dC4KZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmct Y29uZmlnL2NvbmZpZy5qc29uIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvY29uZmlnLmpzb24KaW5kZXggOThiZjRiMmY4MTc1NzMzOGY5N2Q0YjAyNTZi OWUxMjYxZjZlNDg3Zi4uMzJiZDIwMWVlM2M3ZmM0ZTJkZTEyN2Q0YzZiNGM3YjNkNzE4MTg4NCAx MDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25m aWcvY29uZmlnLmpzb24KKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvY29uZmlnLmpzb24KQEAgLTQ0LDcgKzQ0LDcgQEAKICAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJzemVnZWQtd2luZG93cy0xIiwgInBsYXRmb3JtIjogInF0LXdpbiJ9 LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN6ZWdlZC13aW5kb3dzLTIiLCAicGxh dGZvcm0iOiAicXQtd2luIn0sCiAKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpbmR0 LW1vdW50YWlubGlvbiIsICJwbGF0Zm9ybSI6ICJxdC1tYWMifSwKKyAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJvc2xvLW1vdW50YWlubGlvbiIsICJwbGF0Zm9ybSI6ICJxdC01LjAtbWFj LXdrMiJ9LAogCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZ29vZ2xlLXdpbmRvd3Mt MSIsICJwbGF0Zm9ybSI6ICJjaHJvbWl1bS13aW4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAiZ29vZ2xlLXdpbmRvd3MtMiIsICJwbGF0Zm9ybSI6ICJjaHJvbWl1bS13aW4iIH0s CkBAIC0yNDQsOCArMjQ0LDggQEAKICAgICAgICAgICAgICAgICAgICAgICAic2xhdmVuYW1lcyI6 IFsic3plZ2VkLXdpbmRvd3MtMiJdCiAgICAgICAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAg ICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJRdCBNb3VudGFpbiBM aW9uIFJlbGVhc2UiLCAidHlwZSI6ICJCdWlsZCIsICJidWlsZGRpciI6ICJxdC1tb3VudGFpbmxp b24tcmVsZWFzZSIsCi0gICAgICAgICAgICAgICAgICAgICAgInBsYXRmb3JtIjogInF0LW1hYyIs ICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLCAiYXJjaGl0ZWN0dXJlcyI6IFsieDg2XzY0Il0s CisgICAgICAgICAgICAgICAgICAgICAgIm5hbWUiOiAiUXQgTW91bnRhaW4gTGlvbiBSZWxlYXNl IiwgInR5cGUiOiAiQnVpbGRBbmRUZXN0V2ViS2l0MiIsICJidWlsZGRpciI6ICJxdC1tb3VudGFp bmxpb24tcmVsZWFzZSIsCisgICAgICAgICAgICAgICAgICAgICAgInBsYXRmb3JtIjogInF0LTUu MC1tYWMtd2syIiwgImNvbmZpZ3VyYXRpb24iOiAicmVsZWFzZSIsICJhcmNoaXRlY3R1cmVzIjog WyJ4ODZfNjQiXSwKICAgICAgICAgICAgICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsiaW5kdC1t b3VudGFpbmxpb24iXQogICAgICAgICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgICAgICAg ICB7CmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9tYXN0ZXIuY2ZnIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvbWFzdGVyLmNmZwppbmRleCA5ZDA3YjhjNjkyMDdjZjZiYmQ5MTNjZDYxYjA0 N2RiOTJmZmY5NWRiLi5hMTg3ZWNkNGYyNzhjNWFjNTliMDFkYTc1OWJjNWNkMDUxNGEzMjc5IDEw MDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZp Zy9tYXN0ZXIuY2ZnCisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL21hc3Rlci5jZmcKQEAgLTU5OCwxMCArNTk4LDE1IEBAIGNsYXNzIFJ1blF0QVBJ VGVzdHMoc2hlbGwuVGVzdCk6CiAgICAgbmFtZSA9ICJBUEkgdGVzdHMiCiAgICAgZGVzY3JpcHRp b24gPSBbIkFQSSB0ZXN0cyBydW5uaW5nIl0KICAgICBkZXNjcmlwdGlvbkRvbmUgPSBbIkFQSSB0 ZXN0cyJdCi0gICAgY29tbWFuZCA9IFsicHl0aG9uIiwgIi4vVG9vbHMvU2NyaXB0cy9ydW4tcXR3 ZWJraXQtdGVzdHMiLAotICAgICAgICAgICAgICAgIi0tb3V0cHV0LWZpbGU9cXQtdW5pdC10ZXN0 cy5odG1sIiwgIi0tZG8tbm90LW9wZW4tcmVzdWx0cyIsICItLXRpbWVvdXQ9MTIwIiwKLSAgICAg ICAgICAgICAgIFdpdGhQcm9wZXJ0aWVzKCJXZWJLaXRCdWlsZC8lKGNvbmZpZ3VyYXRpb25fcHJl dHR5KXMvU291cmNlL1dlYktpdC9xdC90ZXN0cy8iLCBjb25maWd1cmF0aW9uX3ByZXR0eT1sYW1i ZGEgYnVpbGQ6IGJ1aWxkLmdldFByb3BlcnR5KCJjb25maWd1cmF0aW9uIikudGl0bGUoKSkKLSAg ICAgICAgICAgICAgICBdCisKKyAgICBkZWYgc3RhcnQoc2VsZik6CisgICAgICAgIGlmIHNlbGYu Z2V0UHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScpLmVuZHN3aXRoKCItd2syIik6CisgICAgICAgICAg ICB0ZXN0RGlyZWN0b3J5ID0gIldlYktpdEJ1aWxkLyVzL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvdGVzdHMvIiAlIHNlbGYuZ2V0UHJvcGVydHkoJ2NvbmZpZ3VyYXRpb24nKS50aXRs ZSgpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICB0ZXN0RGlyZWN0b3J5ID0gIldlYktpdEJ1 aWxkLyVzL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvIiAlIHNlbGYuZ2V0UHJvcGVydHkoJ2NvbmZp Z3VyYXRpb24nKS50aXRsZSgpCisKKyAgICAgICAgc2VsZi5zZXRDb21tYW5kKCBbInB5dGhvbiIs ICIuL1Rvb2xzL1NjcmlwdHMvcnVuLXF0d2Via2l0LXRlc3RzIiwgIi0tb3V0cHV0LWZpbGU9cXQt dW5pdC10ZXN0cy5odG1sIiwgIi0tZG8tbm90LW9wZW4tcmVzdWx0cyIsICItLXRpbWVvdXQ9MTIw IiwgdGVzdERpcmVjdG9yeV0gKQorICAgICAgICByZXR1cm4gc2hlbGwuVGVzdC5zdGFydChzZWxm KQogCiAgICAgZGVmIGNvbW1hbmRDb21wbGV0ZShzZWxmLCBjbWQpOgogICAgICAgICBzaGVsbC5U ZXN0LmNvbW1hbmRDb21wbGV0ZShzZWxmLCBjbWQpCkBAIC02NTgsNiArNjYzLDkgQEAgY2xhc3Mg UnVuV2ViS2l0MlRlc3RzKFJ1bldlYktpdFRlc3RzKToKICAgICBkZWYgc3RhcnQoc2VsZik6CiAg ICAgICAgIHNlbGYuc2V0UHJvcGVydHkoInNob3VsZEFib3J0RWFybHkiLCBGYWxzZSkKICAgICAg ICAgc2VsZi5zZXRDb21tYW5kKHNlbGYuY29tbWFuZCArIFsiLS13ZWJraXQtdGVzdC1ydW5uZXIi XSkKKyAgICAgICAgaWYgc2VsZi5nZXRQcm9wZXJ0eSgnYnVpbGRlcm5hbWUnKSA9PSAiUXQgTW91 bnRhaW4gTGlvbiBSZWxlYXNlIjoKKyAgICAgICAgICAgIHNlbGYuc2V0Q29tbWFuZChzZWxmLmNv bW1hbmQgKyBbIi1wIl0pCisKICAgICAgICAgcmV0dXJuIFJ1bldlYktpdFRlc3RzLnN0YXJ0KHNl bGYpCiAKIApAQCAtODU2LDYgKzg2NCwxMCBAQCBjbGFzcyBCdWlsZEFuZFRlc3RGYWN0b3J5KEZh Y3RvcnkpOgogICAgICAgICAgICAgc2VsZi5hZGRTdGVwKFVwbG9hZEJ1aWx0UHJvZHVjdCgpKQog ICAgICAgICAgICAgc2VsZi5hZGRTdGVwKHRyaWdnZXIuVHJpZ2dlcihzY2hlZHVsZXJOYW1lcz10 cmlnZ2VycykpCiAKK2NsYXNzIEJ1aWxkQW5kVGVzdFdlYktpdDJGYWN0b3J5KEJ1aWxkQW5kVGVz dEZhY3RvcnkpOgorICAgIENvbXBpbGVDbGFzcyA9IENvbXBpbGVXZWJLaXQKKyAgICBUZXN0Q2xh c3MgPSBSdW5XZWJLaXQyVGVzdHMKKwogY2xhc3MgQnVpbGRBbmRUZXN0V2ViS2l0MU9ubHlGYWN0 b3J5KEJ1aWxkQW5kVGVzdEZhY3RvcnkpOgogICAgIENvbXBpbGVDbGFzcyA9IENvbXBpbGVXZWJL aXQxT25seQogCg== 194839 2013-03-25 06:31:40 -0700 2013-03-25 11:33:16 -0700 Patch bug-113191-20130325142828.patch text/plain 5079 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NzU4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTA0OTFkYjkwMDVjZWE1NmY4ZTBiOTczOWQzZWIzZTQy YzQ5YjVhZS4uYjFlOGJlMWE5ZTdlMWFiZjMwOWJhYmY0MGZiODgwNmZlMzBjNzJmMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDEzLTAzLTI1ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisK KyAgICAgICAgbWFzdGVyLmNmZyBmaW5lLXR1bmluZyBmb3IgUXQgTW91bnRhaW4gTGlvbiBSZWxl YXNlIGJvdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTEzMTkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9jb25maWcuanNvbjoK KyAgICAgICAgICAtIFJlbmFtZSB0aGUgc2xhdmUgZHVlIHRvIGl0cyBsb2NhdGlvbiBjaGFuZ2Uu CisgICAgICAgICAgLSBVcGRhdGUgdGhlIHBsYXRmb3JtIG9mIHRoZSBzbGF2ZS4KKyAgICAgICAg KiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnOgor ICAgICAgICAoUnVuUXRBUElUZXN0cyk6IEVuYWJsZSBydW5uaW5nIFdLMiBBUEkgdGVzdHMgb24g UXQuCisgICAgICAgIChSdW5RdEFQSVRlc3RzLnN0YXJ0KToKKyAgICAgICAgKFJ1bldlYktpdDJU ZXN0cy5zdGFydCk6IEZvcmNlIHBpeGVsIHRlc3RzIG9uIHRoZSBRdCBNb3VudGFpbiBMaW9uIFJl bGVhc2UgYnVpbGRlci4KKyAgICAgICAgKEJ1aWxkQW5kVGVzdFdlYktpdDJGYWN0b3J5KTogQWRk ZWQuIChCdWlsZCBXSzEgYW5kIFdLMiB0b28sIGJ1dCBydW4gb25seSBXSzIgdGVzdHMuKQorCiAy MDEzLTAzLTIyICBLaXJhbiBNdXBwYWxhICA8Y211cHBhbGFAYXBwbGUuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQuICBNb3ZlIHNlbGYgZnJvbSBjb250cmlidXRvciB0byBjb21taXR0ZXIgbGlz dC4KZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmct Y29uZmlnL2NvbmZpZy5qc29uIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvY29uZmlnLmpzb24KaW5kZXggOThiZjRiMmY4MTc1NzMzOGY5N2Q0YjAyNTZi OWUxMjYxZjZlNDg3Zi4uZWQwZGM4NjQ3OWI5ZDJhZmJlNjM3MDZhYjQ2YTZlY2RmYjBhYmM1ZCAx MDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25m aWcvY29uZmlnLmpzb24KKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvY29uZmlnLmpzb24KQEAgLTQ0LDcgKzQ0LDcgQEAKICAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJzemVnZWQtd2luZG93cy0xIiwgInBsYXRmb3JtIjogInF0LXdpbiJ9 LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN6ZWdlZC13aW5kb3dzLTIiLCAicGxh dGZvcm0iOiAicXQtd2luIn0sCiAKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpbmR0 LW1vdW50YWlubGlvbiIsICJwbGF0Zm9ybSI6ICJxdC1tYWMifSwKKyAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJvc2xvLW1vdW50YWlubGlvbiIsICJwbGF0Zm9ybSI6ICJxdC01LjAtbWFj LXdrMiJ9LAogCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZ29vZ2xlLXdpbmRvd3Mt MSIsICJwbGF0Zm9ybSI6ICJjaHJvbWl1bS13aW4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAiZ29vZ2xlLXdpbmRvd3MtMiIsICJwbGF0Zm9ybSI6ICJjaHJvbWl1bS13aW4iIH0s CkBAIC0yNDQsOSArMjQ0LDkgQEAKICAgICAgICAgICAgICAgICAgICAgICAic2xhdmVuYW1lcyI6 IFsic3plZ2VkLXdpbmRvd3MtMiJdCiAgICAgICAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAg ICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJRdCBNb3VudGFpbiBM aW9uIFJlbGVhc2UiLCAidHlwZSI6ICJCdWlsZCIsICJidWlsZGRpciI6ICJxdC1tb3VudGFpbmxp b24tcmVsZWFzZSIsCi0gICAgICAgICAgICAgICAgICAgICAgInBsYXRmb3JtIjogInF0LW1hYyIs ICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLCAiYXJjaGl0ZWN0dXJlcyI6IFsieDg2XzY0Il0s Ci0gICAgICAgICAgICAgICAgICAgICAgInNsYXZlbmFtZXMiOiBbImluZHQtbW91bnRhaW5saW9u Il0KKyAgICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJRdCBNb3VudGFpbiBMaW9uIFJlbGVh c2UiLCAidHlwZSI6ICJCdWlsZEFuZFRlc3RXZWJLaXQyIiwgImJ1aWxkZGlyIjogInF0LW1vdW50 YWlubGlvbi1yZWxlYXNlIiwKKyAgICAgICAgICAgICAgICAgICAgICAicGxhdGZvcm0iOiAicXQt NS4wLW1hYy13azIiLCAiY29uZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwgImFyY2hpdGVjdHVyZXMi OiBbIng4Nl82NCJdLAorICAgICAgICAgICAgICAgICAgICAgICJzbGF2ZW5hbWVzIjogWyJvc2xv LW1vdW50YWlubGlvbiJdCiAgICAgICAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAgICAg ICAgIHsKICAgICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJDaHJvbWl1bSBXaW4gUmVsZWFz ZSIsICJ0eXBlIjogIkJ1aWxkIiwgImJ1aWxkZGlyIjogImNocm9taXVtLXdpbi1yZWxlYXNlIiwK ZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL21hc3Rlci5jZmcgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9tYXN0ZXIuY2ZnCmluZGV4IDlkMDdiOGM2OTIwN2NmNmJiZDkxM2NkNjFiMDQ3ZGI5 MmZmZjk1ZGIuLmExODdlY2Q0ZjI3OGM1YWM1OWIwMWRhNzU5YmM1Y2QwNTE0YTMyNzkgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21h c3Rlci5jZmcKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1j b25maWcvbWFzdGVyLmNmZwpAQCAtNTk4LDEwICs1OTgsMTUgQEAgY2xhc3MgUnVuUXRBUElUZXN0 cyhzaGVsbC5UZXN0KToKICAgICBuYW1lID0gIkFQSSB0ZXN0cyIKICAgICBkZXNjcmlwdGlvbiA9 IFsiQVBJIHRlc3RzIHJ1bm5pbmciXQogICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsiQVBJIHRlc3Rz Il0KLSAgICBjb21tYW5kID0gWyJweXRob24iLCAiLi9Ub29scy9TY3JpcHRzL3J1bi1xdHdlYmtp dC10ZXN0cyIsCi0gICAgICAgICAgICAgICAiLS1vdXRwdXQtZmlsZT1xdC11bml0LXRlc3RzLmh0 bWwiLCAiLS1kby1ub3Qtb3Blbi1yZXN1bHRzIiwgIi0tdGltZW91dD0xMjAiLAotICAgICAgICAg ICAgICAgV2l0aFByb3BlcnRpZXMoIldlYktpdEJ1aWxkLyUoY29uZmlndXJhdGlvbl9wcmV0dHkp cy9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzLyIsIGNvbmZpZ3VyYXRpb25fcHJldHR5PWxhbWJkYSBi dWlsZDogYnVpbGQuZ2V0UHJvcGVydHkoImNvbmZpZ3VyYXRpb24iKS50aXRsZSgpKQotICAgICAg ICAgICAgICAgIF0KKworICAgIGRlZiBzdGFydChzZWxmKToKKyAgICAgICAgaWYgc2VsZi5nZXRQ cm9wZXJ0eSgnZnVsbFBsYXRmb3JtJykuZW5kc3dpdGgoIi13azIiKToKKyAgICAgICAgICAgIHRl c3REaXJlY3RvcnkgPSAiV2ViS2l0QnVpbGQvJXMvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC90ZXN0cy8iICUgc2VsZi5nZXRQcm9wZXJ0eSgnY29uZmlndXJhdGlvbicpLnRpdGxlKCkK KyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHRlc3REaXJlY3RvcnkgPSAiV2ViS2l0QnVpbGQv JXMvU291cmNlL1dlYktpdC9xdC90ZXN0cy8iICUgc2VsZi5nZXRQcm9wZXJ0eSgnY29uZmlndXJh dGlvbicpLnRpdGxlKCkKKworICAgICAgICBzZWxmLnNldENvbW1hbmQoIFsicHl0aG9uIiwgIi4v VG9vbHMvU2NyaXB0cy9ydW4tcXR3ZWJraXQtdGVzdHMiLCAiLS1vdXRwdXQtZmlsZT1xdC11bml0 LXRlc3RzLmh0bWwiLCAiLS1kby1ub3Qtb3Blbi1yZXN1bHRzIiwgIi0tdGltZW91dD0xMjAiLCB0 ZXN0RGlyZWN0b3J5XSApCisgICAgICAgIHJldHVybiBzaGVsbC5UZXN0LnN0YXJ0KHNlbGYpCiAK ICAgICBkZWYgY29tbWFuZENvbXBsZXRlKHNlbGYsIGNtZCk6CiAgICAgICAgIHNoZWxsLlRlc3Qu Y29tbWFuZENvbXBsZXRlKHNlbGYsIGNtZCkKQEAgLTY1OCw2ICs2NjMsOSBAQCBjbGFzcyBSdW5X ZWJLaXQyVGVzdHMoUnVuV2ViS2l0VGVzdHMpOgogICAgIGRlZiBzdGFydChzZWxmKToKICAgICAg ICAgc2VsZi5zZXRQcm9wZXJ0eSgic2hvdWxkQWJvcnRFYXJseSIsIEZhbHNlKQogICAgICAgICBz ZWxmLnNldENvbW1hbmQoc2VsZi5jb21tYW5kICsgWyItLXdlYmtpdC10ZXN0LXJ1bm5lciJdKQor ICAgICAgICBpZiBzZWxmLmdldFByb3BlcnR5KCdidWlsZGVybmFtZScpID09ICJRdCBNb3VudGFp biBMaW9uIFJlbGVhc2UiOgorICAgICAgICAgICAgc2VsZi5zZXRDb21tYW5kKHNlbGYuY29tbWFu ZCArIFsiLXAiXSkKKwogICAgICAgICByZXR1cm4gUnVuV2ViS2l0VGVzdHMuc3RhcnQoc2VsZikK IAogCkBAIC04NTYsNiArODY0LDEwIEBAIGNsYXNzIEJ1aWxkQW5kVGVzdEZhY3RvcnkoRmFjdG9y eSk6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoVXBsb2FkQnVpbHRQcm9kdWN0KCkpCiAgICAg ICAgICAgICBzZWxmLmFkZFN0ZXAodHJpZ2dlci5UcmlnZ2VyKHNjaGVkdWxlck5hbWVzPXRyaWdn ZXJzKSkKIAorY2xhc3MgQnVpbGRBbmRUZXN0V2ViS2l0MkZhY3RvcnkoQnVpbGRBbmRUZXN0RmFj dG9yeSk6CisgICAgQ29tcGlsZUNsYXNzID0gQ29tcGlsZVdlYktpdAorICAgIFRlc3RDbGFzcyA9 IFJ1bldlYktpdDJUZXN0cworCiBjbGFzcyBCdWlsZEFuZFRlc3RXZWJLaXQxT25seUZhY3Rvcnko QnVpbGRBbmRUZXN0RmFjdG9yeSk6CiAgICAgQ29tcGlsZUNsYXNzID0gQ29tcGlsZVdlYktpdDFP bmx5CiAK 195051 2013-03-26 03:45:26 -0700 2013-03-27 08:42:44 -0700 Patch bug-113191-20130326034214.patch text/plain 4920 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2ODYyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzcxMGViZTA0MjJkM2Q0NWQ5ZTcwNDZjNTg0MTI1YWQz Mzg5ZTI0Ni4uZWZjYTAwNDAyOTNiMzhlNTBmNTE4NDVjNzYxMjYwZWJkNjAyODRlZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDEzLTAzLTI2ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisK KyAgICAgICAgbWFzdGVyLmNmZyBmaW5lLXR1bmluZyBmb3IgUXQgTW91bnRhaW4gTGlvbiBSZWxl YXNlIGJvdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTEzMTkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9jb25maWcuanNvbjoK KyAgICAgICAgICAtIFJlbmFtZSB0aGUgc2xhdmUgZHVlIHRvIGl0cyBsb2NhdGlvbiBjaGFuZ2Uu CisgICAgICAgICAgLSBVcGRhdGUgdGhlIHBsYXRmb3JtIG9mIHRoZSBzbGF2ZS4KKyAgICAgICAg KiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnOgor ICAgICAgICAoUnVuUXRBUElUZXN0cyk6IEVuYWJsZSBydW5uaW5nIFdLMiBBUEkgdGVzdHMgb24g UXQuCisgICAgICAgIChSdW5RdEFQSVRlc3RzLnN0YXJ0KToKKyAgICAgICAgKFJ1bldlYktpdDJU ZXN0cy5zdGFydCk6IEZvcmNlIHBpeGVsIHRlc3RzIG9uIHRoZSBRdCBNb3VudGFpbiBMaW9uIFJl bGVhc2UgYnVpbGRlci4KKyAgICAgICAgKEJ1aWxkQW5kVGVzdFdlYktpdDJGYWN0b3J5KTogQWRk ZWQuIChCdWlsZCBXSzEgYW5kIFdLMiB0b28sIGJ1dCBydW4gb25seSBXSzIgdGVzdHMuKQorCiAy MDEzLTAzLTI2ICBBbGFuIEN1dHRlciAgPGFsYW5jdXR0ZXJAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFNoZXJpZmZib3Qgc2hvdWxkIGV4cGxhaW4gcm9sbG91dCBmYWlsdXJlcyBpbiBhIGh1bWFu IHJlYWRhYmxlIGZvcm0uCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWls ZC53ZWJraXQub3JnLWNvbmZpZy9jb25maWcuanNvbiBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL2NvbmZpZy5qc29uCmluZGV4IDY2YTM1ZThhODJiM2Y1 ZmViMTJiNjQ5NmIxZmRjMTZmZTU5ODFiNGIuLjQyNTkzMDY2MzM0NDI2OGNlZTdiZGZiYjY2ODkw NjlkNTk0ODkwZWMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL2NvbmZpZy5qc29uCisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL2NvbmZpZy5qc29uCkBAIC00Miw3ICs0Miw3IEBACiAg ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3plZ2VkLXdpbmRvd3MtMSIsICJwbGF0Zm9y bSI6ICJxdC13aW4ifSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzemVnZWQtd2lu ZG93cy0yIiwgInBsYXRmb3JtIjogInF0LXdpbiJ9LAogCi0gICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAiaW5kdC1tb3VudGFpbmxpb24iLCAicGxhdGZvcm0iOiAicXQtbWFjIn0sCisgICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAib3Nsby1tb3VudGFpbmxpb24iLCAicGxhdGZvcm0i OiAicXQtNS4wLW1hYy13azIifSwKIAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImdv b2dsZS13aW5kb3dzLTEiLCAicGxhdGZvcm0iOiAiY2hyb21pdW0td2luIiB9LAogICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogImdvb2dsZS13aW5kb3dzLTIiLCAicGxhdGZvcm0iOiAiY2hy b21pdW0td2luIiB9LApAQCAtMjM4LDkgKzIzOCw5IEBACiAgICAgICAgICAgICAgICAgICAgICAg InNsYXZlbmFtZXMiOiBbInN6ZWdlZC13aW5kb3dzLTIiXQogICAgICAgICAgICAgICAgICAgICB9 LAogICAgICAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgICAgIm5hbWUiOiAi UXQgTW91bnRhaW4gTGlvbiBSZWxlYXNlIiwgInR5cGUiOiAiQnVpbGQiLCAiYnVpbGRkaXIiOiAi cXQtbW91bnRhaW5saW9uLXJlbGVhc2UiLAotICAgICAgICAgICAgICAgICAgICAgICJwbGF0Zm9y bSI6ICJxdC1tYWMiLCAiY29uZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwgImFyY2hpdGVjdHVyZXMi OiBbIng4Nl82NCJdLAotICAgICAgICAgICAgICAgICAgICAgICJzbGF2ZW5hbWVzIjogWyJpbmR0 LW1vdW50YWlubGlvbiJdCisgICAgICAgICAgICAgICAgICAgICAgIm5hbWUiOiAiUXQgTW91bnRh aW4gTGlvbiBSZWxlYXNlIiwgInR5cGUiOiAiQnVpbGRBbmRUZXN0V2ViS2l0MiIsICJidWlsZGRp ciI6ICJxdC1tb3VudGFpbmxpb24tcmVsZWFzZSIsCisgICAgICAgICAgICAgICAgICAgICAgInBs YXRmb3JtIjogInF0LTUuMC1tYWMtd2syIiwgImNvbmZpZ3VyYXRpb24iOiAicmVsZWFzZSIsICJh cmNoaXRlY3R1cmVzIjogWyJ4ODZfNjQiXSwKKyAgICAgICAgICAgICAgICAgICAgICAic2xhdmVu YW1lcyI6IFsib3Nsby1tb3VudGFpbmxpb24iXQogICAgICAgICAgICAgICAgICAgICB9LAogICAg ICAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgICAgICAgIm5hbWUiOiAiQ2hyb21p dW0gV2luIFJlbGVhc2UiLCAidHlwZSI6ICJCdWlsZCIsICJidWlsZGRpciI6ICJjaHJvbWl1bS13 aW4tcmVsZWFzZSIsCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwppbmRleCA5ZDA3YjhjNjkyMDdjZjZiYmQ5 MTNjZDYxYjA0N2RiOTJmZmY5NWRiLi43NjVlYzI1NzYwYzMyMWJmODJmOTRmNzVhMGUxY2NjMTYz OGQyNWJiIDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQu b3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKQEAgLTU5OCwxMCArNTk4LDEyIEBAIGNsYXNz IFJ1blF0QVBJVGVzdHMoc2hlbGwuVGVzdCk6CiAgICAgbmFtZSA9ICJBUEkgdGVzdHMiCiAgICAg ZGVzY3JpcHRpb24gPSBbIkFQSSB0ZXN0cyBydW5uaW5nIl0KICAgICBkZXNjcmlwdGlvbkRvbmUg PSBbIkFQSSB0ZXN0cyJdCi0gICAgY29tbWFuZCA9IFsicHl0aG9uIiwgIi4vVG9vbHMvU2NyaXB0 cy9ydW4tcXR3ZWJraXQtdGVzdHMiLAotICAgICAgICAgICAgICAgIi0tb3V0cHV0LWZpbGU9cXQt dW5pdC10ZXN0cy5odG1sIiwgIi0tZG8tbm90LW9wZW4tcmVzdWx0cyIsICItLXRpbWVvdXQ9MTIw IiwKLSAgICAgICAgICAgICAgIFdpdGhQcm9wZXJ0aWVzKCJXZWJLaXRCdWlsZC8lKGNvbmZpZ3Vy YXRpb25fcHJldHR5KXMvU291cmNlL1dlYktpdC9xdC90ZXN0cy8iLCBjb25maWd1cmF0aW9uX3By ZXR0eT1sYW1iZGEgYnVpbGQ6IGJ1aWxkLmdldFByb3BlcnR5KCJjb25maWd1cmF0aW9uIikudGl0 bGUoKSkKLSAgICAgICAgICAgICAgICBdCisKKyAgICBkZWYgc3RhcnQoc2VsZik6CisgICAgICAg IHNlbGYuc2V0Q29tbWFuZCggWyJweXRob24iLCAiLi9Ub29scy9TY3JpcHRzL3J1bi1xdHdlYmtp dC10ZXN0cyIsICItLW91dHB1dC1maWxlPXF0LXVuaXQtdGVzdHMuaHRtbCIsICItLWRvLW5vdC1v cGVuLXJlc3VsdHMiLCAiLS10aW1lb3V0PTEyMCIsICItLSVzIiAlIHNlbGYuZ2V0UHJvcGVydHko J2NvbmZpZ3VyYXRpb24nKV0gKQorICAgICAgICBpZiBzZWxmLmdldFByb3BlcnR5KCdmdWxsUGxh dGZvcm0nKS5lbmRzd2l0aCgiLXdrMiIpOgorICAgICAgICAgICAgc2VsZi5zZXRDb21tYW5kKHNl bGYuY29tbWFuZCArIFsnLS13ZWJraXQyJ10pCisgICAgICAgIHJldHVybiBzaGVsbC5UZXN0LnN0 YXJ0KHNlbGYpCiAKICAgICBkZWYgY29tbWFuZENvbXBsZXRlKHNlbGYsIGNtZCk6CiAgICAgICAg IHNoZWxsLlRlc3QuY29tbWFuZENvbXBsZXRlKHNlbGYsIGNtZCkKQEAgLTY1OCw2ICs2NjAsOSBA QCBjbGFzcyBSdW5XZWJLaXQyVGVzdHMoUnVuV2ViS2l0VGVzdHMpOgogICAgIGRlZiBzdGFydChz ZWxmKToKICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgic2hvdWxkQWJvcnRFYXJseSIsIEZhbHNl KQogICAgICAgICBzZWxmLnNldENvbW1hbmQoc2VsZi5jb21tYW5kICsgWyItLXdlYmtpdC10ZXN0 LXJ1bm5lciJdKQorICAgICAgICBpZiBzZWxmLmdldFByb3BlcnR5KCdidWlsZGVybmFtZScpID09 ICJRdCBNb3VudGFpbiBMaW9uIFJlbGVhc2UiOgorICAgICAgICAgICAgc2VsZi5zZXRDb21tYW5k KHNlbGYuY29tbWFuZCArIFsiLXAiXSkKKwogICAgICAgICByZXR1cm4gUnVuV2ViS2l0VGVzdHMu c3RhcnQoc2VsZikKIAogCkBAIC04NTYsNiArODYxLDEwIEBAIGNsYXNzIEJ1aWxkQW5kVGVzdEZh Y3RvcnkoRmFjdG9yeSk6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoVXBsb2FkQnVpbHRQcm9k dWN0KCkpCiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAodHJpZ2dlci5UcmlnZ2VyKHNjaGVkdWxl ck5hbWVzPXRyaWdnZXJzKSkKIAorY2xhc3MgQnVpbGRBbmRUZXN0V2ViS2l0MkZhY3RvcnkoQnVp bGRBbmRUZXN0RmFjdG9yeSk6CisgICAgQ29tcGlsZUNsYXNzID0gQ29tcGlsZVdlYktpdAorICAg IFRlc3RDbGFzcyA9IFJ1bldlYktpdDJUZXN0cworCiBjbGFzcyBCdWlsZEFuZFRlc3RXZWJLaXQx T25seUZhY3RvcnkoQnVpbGRBbmRUZXN0RmFjdG9yeSk6CiAgICAgQ29tcGlsZUNsYXNzID0gQ29t cGlsZVdlYktpdDFPbmx5CiAK