198289 2019-05-28 03:13:22 -0700 [ews-build] Triggered builds should use same revision as parent build 2019-06-20 13:37:12 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap commit-queue ews-watchlist jbedard webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1539519 0 aakash_jain 2019-05-28 03:13:22 -0700 API test should not update the working directory to ToT for retrying without patch. It should use the same revision to create archive from clean-tree from which the archive-with-patch was created. Currently before run-api-tests-without-patch step, 'unapply-patch' step is run (which use 'Tools/Scripts/clean-webkit'), which not only un-apply the patch, but also updates to ToT. This can result in wrong results in some cases, especially when an api test failure is introduced or rolled-back between the first api-test run and the unapply-patch step. e.g.: In https://ews-build.webkit.org/#/builders/9/builds/1847, when the patch processing started there was a failure (TestWebKitAPI.Challenge.ClientCertificate) in the tree, but by the time unapply-patch step run, failure was fixed (rolled-back https://bugs.webkit.org/show_bug.cgi?id=197887). clean-webkit not only cleaned the working directory, but also updated it, and so the new updated ToT did not had this failure, and so the run-api-tests-without-patch passed, and EWS blamed the test failure (TestWebKitAPI.Challenge.ClientCertificate) on the patch. 1546404 1 aakash_jain 2019-06-19 20:57:53 -0700 Note that 'unapply-patch' step doesn't update to ToT, this was already fixed in http://trac.webkit.org/changeset/240107/webkit . Instead, the 'clean-and-update-working-directory' step updates to ToT (as it uses alwaysUseLatest=True). The proper fix would be: a) parent build should pass the revision (as a build property) to the triggered build b) triggered build should (have a build step to) checkout that particular revision 1546508 2 jbedard 2019-06-20 07:30:02 -0700 Won't layout tests have this same problem? I suppose we haven't started running them on new EWS yet. 1546517 3 aakash_jain 2019-06-20 07:51:29 -0700 (In reply to Jonathan Bedard from comment #2) > Won't layout tests have this same problem? I suppose we haven't started running them on new EWS yet. Yup, that's applicable to all the triggered builds. That's why I changed the bug title to make it generic. Fix coming soon. 1546538 4 372560 aakash_jain 2019-06-20 09:21:12 -0700 Created attachment 372560 Patch 1546541 5 ews-watchlist 2019-06-20 09:23:40 -0700 Attachment 372560 did not pass style-queue: ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:858: [TestCheckOutSpecificRevision.test_success] Passing unexpected keyword argument 'state_string' in function call [pylint/E1123] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:858: [TestCheckOutSpecificRevision.test_success] No value passed for parameter 'status_text' in function call [pylint/E1120] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:873: [TestCheckOutSpecificRevision.test_failure] Passing unexpected keyword argument 'state_string' in function call [pylint/E1123] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:873: [TestCheckOutSpecificRevision.test_failure] No value passed for parameter 'status_text' in function call [pylint/E1120] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:879: [TestCheckOutSpecificRevision.test_skip] Passing unexpected keyword argument 'state_string' in function call [pylint/E1123] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:879: [TestCheckOutSpecificRevision.test_skip] No value passed for parameter 'status_text' in function call [pylint/E1120] [5] Total errors found: 6 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1546542 6 aakash_jain 2019-06-20 09:24:55 -0700 Sample runs: Triggered build: https://ews-build.webkit-uat.org/#/builders/19/builds/2792 Parent build (skipped this step): https://ews-build.webkit-uat.org/#/builders/33/builds/4209 1546565 7 372560 jbedard 2019-06-20 10:34:21 -0700 Comment on attachment 372560 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372560&action=review > Tools/BuildSlaveSupport/ews-build/factories.py:43 > self.addStep(CheckOutSource()) Feels weird to have both CheckOutSource and CheckOutSpecificRevision...looking at the code in CheckOutSource, by default, it sets alwaysUseLatest to true. That means that in EWS, we will update to latest, then downgrade to the specific revision, then apply the patch....is there a reasonable way to skip the update-to-latest bit? Clearly we don't want our own 'CheckOutSource' step (buildbot implements that for us, if I'm reading the code correctly). 1546606 8 aakash_jain 2019-06-20 12:04:21 -0700 > Feels weird to have both CheckOutSource and CheckOutSpecificRevision... Agree. > looking at the code in CheckOutSource, by default, it sets alwaysUseLatest to true. Yes, if we don't use alwaysUseLatest=True, Buildbot will automatically apply the patch to the repo, and that doesn't handle ChangeLogs well (we use our own svn-apply script for that). So, we need to use alwaysUseLatest=True. See https://bugs.webkit.org/show_bug.cgi?id=193138 > That means that in EWS, we will update to latest, then downgrade to the specific revision, Other way to think about it is that git will fetch the repository and then switch to specific revision. > then apply the patch....is there a reasonable way to skip the update-to-latest bit? I couldn't find a better way in Buildbot to do that. If we were not using alwaysUseLatest, then we could have overridden computeSourceRevision() method. (https://github.com/buildbot/buildbot/blob/master/master/buildbot/steps/source/base.py#L262). (Side note: In case of non try builders (e.g: SVNPoller/GitPoller), Buildbot finds the revision from the commit/sourcestamp) I don't see a way for Buildbot to update to a specific revision while using alwaysUseLatest=True (which might make sense as per definition of alwaysUseLatest). In https://github.com/buildbot/buildbot/blob/master/master/buildbot/steps/source/git.py#L74 __init__ doesn't take a revision argument either. > Clearly we don't want our own 'CheckOutSource' step (buildbot implements that for us, if I'm reading the code correctly). Yes. 1546620 9 jbedard 2019-06-20 12:53:49 -0700 (In reply to Aakash Jain from comment #8) > ... > > Yes, if we don't use alwaysUseLatest=True, Buildbot will automatically apply > the patch to the repo, and that doesn't handle ChangeLogs well (we use our > own svn-apply script for that). So, we need to use alwaysUseLatest=True. See > https://bugs.webkit.org/show_bug.cgi?id=193138 > ... This is worth a comment, because it's not obvious. This basically explains why we have the duplicate call. 1546625 10 372579 aakash_jain 2019-06-20 13:08:40 -0700 Created attachment 372579 Patch 1546631 11 ews-watchlist 2019-06-20 13:13:38 -0700 Attachment 372579 did not pass style-queue: ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:858: [TestCheckOutSpecificRevision.test_success] Passing unexpected keyword argument 'state_string' in function call [pylint/E1123] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:858: [TestCheckOutSpecificRevision.test_success] No value passed for parameter 'status_text' in function call [pylint/E1120] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:873: [TestCheckOutSpecificRevision.test_failure] Passing unexpected keyword argument 'state_string' in function call [pylint/E1123] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:873: [TestCheckOutSpecificRevision.test_failure] No value passed for parameter 'status_text' in function call [pylint/E1120] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:879: [TestCheckOutSpecificRevision.test_skip] Passing unexpected keyword argument 'state_string' in function call [pylint/E1123] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:879: [TestCheckOutSpecificRevision.test_skip] No value passed for parameter 'status_text' in function call [pylint/E1120] [5] Total errors found: 6 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1546637 12 372579 commit-queue 2019-06-20 13:31:37 -0700 Comment on attachment 372579 Patch Rejecting attachment 372579 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 372579, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=372579&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=198289&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Processing patch 372579 from bug 198289. Fetching: https://bugs.webkit.org/attachment.cgi?id=372579 Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Jonathan Bedard']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 4 diffs from patch file(s). patching file Tools/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Tools/BuildSlaveSupport/ews-build/factories.py patching file Tools/BuildSlaveSupport/ews-build/steps.py patching file Tools/BuildSlaveSupport/ews-build/steps_unittest.py Hunk #1 FAILED at 35. Hunk #2 succeeded at 870 (offset 34 lines). 1 out of 2 hunks FAILED -- saving rejects to file Tools/BuildSlaveSupport/ews-build/steps_unittest.py.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Jonathan Bedard']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 4 diffs from patch file(s). patching file Tools/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Tools/BuildSlaveSupport/ews-build/factories.py patching file Tools/BuildSlaveSupport/ews-build/steps.py patching file Tools/BuildSlaveSupport/ews-build/steps_unittest.py Hunk #1 FAILED at 35. Hunk #2 succeeded at 870 (offset 34 lines). 1 out of 2 hunks FAILED -- saving rejects to file Tools/BuildSlaveSupport/ews-build/steps_unittest.py.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Jonathan Bedard']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource From https://git.webkit.org/git/WebKit abe2c22ad5f..8cdd4e6ef0c master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 246649 = abe2c22ad5f2dd20c9d3a9dcdec38d9c51cb1835 r246650 = 8cdd4e6ef0c1f0a33512f3d92f7e5d254e7b1c30 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: https://webkit-queues.webkit.org/results/12534172 1546639 13 aakash_jain 2019-06-20 13:36:01 -0700 Committed r246651: <https://trac.webkit.org/changeset/246651> 1546640 14 webkit-bug-importer 2019-06-20 13:37:12 -0700 <rdar://problem/51957653> 1546641 15 webkit-bug-importer 2019-06-20 13:37:12 -0700 <rdar://problem/51957654> 372560 2019-06-20 09:21:12 -0700 2019-06-20 13:08:37 -0700 Patch bug-198289-20190620122111.patch text/plain 6896 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NjYzNSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDE5LTA2LTIwICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWJ1aWxkXSBUcmlnZ2VyZWQgYnVpbGRzIHNob3VsZCB1c2Ugc2Ft ZSByZXZpc2lvbiBhcyBwYXJlbnQgYnVpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE5ODI4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5 OgorICAgICAgICAoQ2hlY2tPdXRTcGVjaWZpY1JldmlzaW9uKTogQnVpbGQgc3RlcCB0byBjaGVj a291dCBzcGVjaWZpYyByZXZpc2lvbi4KKyAgICAgICAgKENoZWNrT3V0U3BlY2lmaWNSZXZpc2lv bi5kb1N0ZXBJZik6IFJ1biB0aGlzIHN0ZXAgb25seSBpZiBld3NfcmV2aXNpb24gcHJvcGVydHkg aXMgc2V0LgorICAgICAgICAoQ2hlY2tPdXRTcGVjaWZpY1JldmlzaW9uLmhpZGVTdGVwSWYpOiBI aWRlIHRoaXMgc3RlcCB3aGVuIGl0IGlzIHNraXBwZWQuCisgICAgICAgIChDaGVja091dFNwZWNp ZmljUmV2aXNpb24uc3RhcnQpOiBSdW4gYXBwcm9wcmlhdGUgZ2l0IGNvbW1hbmQuCisgICAgICAg IChUcmlnZ2VyLnByb3BlcnRpZXNUb1Bhc3NUb1RyaWdnZXJzKTogUGFzcyBld3NfcmV2aXNpb24g cHJvcGVydHkgdG8gdHJpZ2dlcmVkIGJ1aWxkcywgc28gdGhhdCB0cmlnZ2VyZWQKKyAgICAgICAg YnVpbGRzIHVzZSBzYW1lIHJldmlzaW9uIGFzIHBhcmVudCBidWlsZC4KKyAgICAgICAgKiBCdWls ZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHk6IEFkZGVkIHVuaXQtdGVz dHMuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weToK KyAgICAgICAgKEZhY3RvcnkuX19pbml0X18pOiBBZGRlZCBDaGVja091dFNwZWNpZmljUmV2aXNp b24gc3RlcC4KKwogMjAxOS0wNi0yMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gUmVtb3ZlIHN1cHBvcnQgZm9yIEdUSzIgcGx1Z2lu cwpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVz LnB5CShyZXZpc2lvbiAyNDY2MzUpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVp bGQvZmFjdG9yaWVzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNCw4ICsyNCw4IEBACiBmcm9tIGJ1 aWxkYm90LnByb2Nlc3MgaW1wb3J0IGZhY3RvcnkKIGZyb20gYnVpbGRib3Quc3RlcHMgaW1wb3J0 IHRyaWdnZXIKIAotZnJvbSBzdGVwcyBpbXBvcnQgKEFwcGx5UGF0Y2gsIENoZWNrT3V0U291cmNl LCBDaGVja1BhdGNoUmVsZXZhbmNlLCBDaGVja1N0eWxlLAotICAgICAgICAgICAgICAgICAgIENv bXBpbGVKU0NPbmx5LCBDb21waWxlSlNDT25seVRvVCwgQ29tcGlsZVdlYktpdCwgQ29uZmlndXJl QnVpbGQsCitmcm9tIHN0ZXBzIGltcG9ydCAoQXBwbHlQYXRjaCwgQ2hlY2tPdXRTb3VyY2UsIENo ZWNrT3V0U3BlY2lmaWNSZXZpc2lvbiwgQ2hlY2tQYXRjaFJlbGV2YW5jZSwKKyAgICAgICAgICAg ICAgICAgICBDaGVja1N0eWxlLCBDb21waWxlSlNDT25seSwgQ29tcGlsZUpTQ09ubHlUb1QsIENv bXBpbGVXZWJLaXQsIENvbmZpZ3VyZUJ1aWxkLAogICAgICAgICAgICAgICAgICAgIERvd25sb2Fk QnVpbHRQcm9kdWN0LCBFeHRyYWN0QnVpbHRQcm9kdWN0LCBLaWxsT2xkUHJvY2Vzc2VzLAogICAg ICAgICAgICAgICAgICAgIFByaW50Q29uZmlndXJhdGlvbiwgUmVSdW5KYXZhU2NyaXB0Q29yZVRl c3RzLCBSdW5BUElUZXN0cywgUnVuQmluZGluZ3NUZXN0cywKICAgICAgICAgICAgICAgICAgICBS dW5KYXZhU2NyaXB0Q29yZVRlc3RzLCBSdW5KYXZhU2NyaXB0Q29yZVRlc3RzVG9ULCBSdW5XZWJL aXQxVGVzdHMsIFJ1bldlYktpdFBlcmxUZXN0cywKQEAgLTQxLDYgKzQxLDcgQEAgY2xhc3MgRmFj dG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6CiAgICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0 ZVBhdGNoKCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChQcmludENvbmZpZ3VyYXRpb24oKSkKICAg ICAgICAgc2VsZi5hZGRTdGVwKENoZWNrT3V0U291cmNlKCkpCisgICAgICAgIHNlbGYuYWRkU3Rl cChDaGVja091dFNwZWNpZmljUmV2aXNpb24oKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKEFwcGx5 UGF0Y2goKSkKIAogCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3Rl cHMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0 ZXBzLnB5CShyZXZpc2lvbiAyNDY2MzUpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3Mt YnVpbGQvc3RlcHMucHkJKHdvcmtpbmcgY29weSkKQEAgLTEwNyw2ICsxMDcsMjMgQEAgY2xhc3Mg Q2hlY2tPdXRTb3VyY2UoZ2l0LkdpdCk6CiAgICAgICAgICAgICByZXR1cm4ge3Unc3RlcCc6IHUn Q2xlYW5lZCBhbmQgdXBkYXRlZCB3b3JraW5nIGRpcmVjdG9yeSd9CiAKIAorY2xhc3MgQ2hlY2tP dXRTcGVjaWZpY1JldmlzaW9uKHNoZWxsLlNoZWxsQ29tbWFuZCk6CisgICAgbmFtZSA9ICdjaGVj a291dC1zcGVjaWZpYy1yZXZpc2lvbicKKyAgICBkZXNjcmlwdGlvbkRvbmUgPSBbJ0NoZWNrZWQg b3V0IHJlcXVpcmVkIHJldmlzaW9uJ10KKyAgICBmbHVua09uRmFpbHVyZSA9IEZhbHNlCisgICAg aGFsdE9uRmFpbHVyZSA9IEZhbHNlCisKKyAgICBkZWYgZG9TdGVwSWYoc2VsZiwgc3RlcCk6Cisg ICAgICAgIHJldHVybiBzZWxmLmdldFByb3BlcnR5KCdld3NfcmV2aXNpb24nLCBGYWxzZSkKKwor ICAgIGRlZiBoaWRlU3RlcElmKHNlbGYsIHJlc3VsdHMsIHN0ZXApOgorICAgICAgICByZXR1cm4g bm90IHNlbGYuZG9TdGVwSWYoc3RlcCkKKworICAgIGRlZiBzdGFydChzZWxmKToKKyAgICAgICAg c2VsZi5zZXRDb21tYW5kKFsnZ2l0JywgJ2NoZWNrb3V0Jywgc2VsZi5nZXRQcm9wZXJ0eSgnZXdz X3JldmlzaW9uJyldKQorICAgICAgICByZXR1cm4gc2hlbGwuU2hlbGxDb21tYW5kLnN0YXJ0KHNl bGYpCisKKwogY2xhc3MgQ2xlYW5Xb3JraW5nRGlyZWN0b3J5KHNoZWxsLlNoZWxsQ29tbWFuZCk6 CiAgICAgbmFtZSA9ICdjbGVhbi13b3JraW5nLWRpcmVjdG9yeScKICAgICBkZXNjcmlwdGlvbiA9 IFsnY2xlYW4td29ya2luZy1kaXJlY3RvcnkgcnVubmluZyddCkBAIC00MDQsNiArNDIxLDcgQEAg Y2xhc3MgVHJpZ2dlcih0cmlnZ2VyLlRyaWdnZXIpOgogICAgICAgICAgICAgJ2Z1bGxQbGF0Zm9y bSc6IHByb3BlcnRpZXMuUHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScpLAogICAgICAgICAgICAgJ2Fy Y2hpdGVjdHVyZSc6IHByb3BlcnRpZXMuUHJvcGVydHkoJ2FyY2hpdGVjdHVyZScpLAogICAgICAg ICAgICAgJ293bmVyJzogcHJvcGVydGllcy5Qcm9wZXJ0eSgnb3duZXInKSwKKyAgICAgICAgICAg ICdld3NfcmV2aXNpb24nOiBwcm9wZXJ0aWVzLlByb3BlcnR5KCdnb3RfcmV2aXNpb24nKSwKICAg ICAgICAgfQogCiAKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVw c191bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3Mt YnVpbGQvc3RlcHNfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI0NjYzNSkKKysrIFRvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpA QCAtMzUsNyArMzUsNyBAQCBmcm9tIHR3aXN0ZWQucHl0aG9uIGltcG9ydCBmYWlsdXJlLCBsb2cK IGZyb20gdHdpc3RlZC50cmlhbCBpbXBvcnQgdW5pdHRlc3QKIAogZnJvbSBzdGVwcyBpbXBvcnQg KEFuYWx5emVBUElUZXN0c1Jlc3VsdHMsIEFwcGx5UGF0Y2gsIEFyY2hpdmVCdWlsdFByb2R1Y3Qs IEFyY2hpdmVUZXN0UmVzdWx0cywKLSAgICAgICAgICAgICAgICAgICBDaGVja091dFNvdXJjZSwg Q2hlY2tQYXRjaFJlbGV2YW5jZSwgQ2hlY2tTdHlsZSwgQ2xlYW5CdWlsZCwgQ2xlYW5Xb3JraW5n RGlyZWN0b3J5LAorICAgICAgICAgICAgICAgICAgIENoZWNrT3V0U291cmNlLCBDaGVja091dFNw ZWNpZmljUmV2aXNpb24sIENoZWNrUGF0Y2hSZWxldmFuY2UsIENoZWNrU3R5bGUsIENsZWFuQnVp bGQsIENsZWFuV29ya2luZ0RpcmVjdG9yeSwKICAgICAgICAgICAgICAgICAgICBDb21waWxlSlND T25seSwgQ29tcGlsZUpTQ09ubHlUb1QsIENvbXBpbGVXZWJLaXQsIENvbXBpbGVXZWJLaXRUb1Qs IENvbmZpZ3VyZUJ1aWxkLAogICAgICAgICAgICAgICAgICAgIERvd25sb2FkQnVpbHRQcm9kdWN0 LCBFeHRyYWN0QnVpbHRQcm9kdWN0LCBFeHRyYWN0VGVzdFJlc3VsdHMsIEtpbGxPbGRQcm9jZXNz ZXMsCiAgICAgICAgICAgICAgICAgICAgUHJpbnRDb25maWd1cmF0aW9uLCBSZVJ1bkFQSVRlc3Rz LCBSZVJ1bkphdmFTY3JpcHRDb3JlVGVzdHMsIFJ1bkFQSVRlc3RzLCBSdW5BUElUZXN0c1dpdGhv dXRQYXRjaCwKQEAgLTgzNiw2ICs4MzYsNTAgQEAgY2xhc3MgVGVzdFJ1bldlYktpdDFUZXN0cyhC dWlsZFN0ZXBNaXhpbgogICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKIAogCitjbGFzcyBU ZXN0Q2hlY2tPdXRTcGVjaWZpY1JldmlzaW9uKEJ1aWxkU3RlcE1peGluQWRkaXRpb25zLCB1bml0 dGVzdC5UZXN0Q2FzZSk6CisgICAgZGVmIHNldFVwKHNlbGYpOgorICAgICAgICBzZWxmLmxvbmdN ZXNzYWdlID0gVHJ1ZQorICAgICAgICByZXR1cm4gc2VsZi5zZXRVcEJ1aWxkU3RlcCgpCisKKyAg ICBkZWYgdGVhckRvd24oc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLnRlYXJEb3duQnVpbGRT dGVwKCkKKworICAgIGRlZiB0ZXN0X3N1Y2Nlc3Moc2VsZik6CisgICAgICAgIHNlbGYuc2V0dXBT dGVwKENoZWNrT3V0U3BlY2lmaWNSZXZpc2lvbigpKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5 KCdld3NfcmV2aXNpb24nLCAnMWEzNDI1Y2I5MmRiY2JjYTEyYTEwYWE5NTE0ZjFiNzdjNzZkYzI2 JykKKyAgICAgICAgc2VsZi5leHBlY3RIaWRkZW4oRmFsc2UpCisgICAgICAgIHNlbGYuZXhwZWN0 UmVtb3RlQ29tbWFuZHMoCisgICAgICAgICAgICBFeHBlY3RTaGVsbCh3b3JrZGlyPSd3a2Rpcics CisgICAgICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PTEyMDAsCisgICAgICAgICAgICAgICAg ICAgICAgICBjb21tYW5kPVsnZ2l0JywgJ2NoZWNrb3V0JywgJzFhMzQyNWNiOTJkYmNiY2ExMmEx MGFhOTUxNGYxYjc3Yzc2ZGMyNiddLAorICAgICAgICAgICAgICAgICAgICAgICAgKQorICAgICAg ICAgICAgKyAwLAorICAgICAgICApCisgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9 U1VDQ0VTUywgc3RhdGVfc3RyaW5nPSdDaGVja2VkIG91dCByZXF1aXJlZCByZXZpc2lvbicpCisg ICAgICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQorCisgICAgZGVmIHRlc3RfZmFpbHVyZShzZWxm KToKKyAgICAgICAgc2VsZi5zZXR1cFN0ZXAoQ2hlY2tPdXRTcGVjaWZpY1JldmlzaW9uKCkpCisg ICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2V3c19yZXZpc2lvbicsICcxYTM0MjVjYjkyZGJjYmNh MTJhMTBhYTk1MTRmMWI3N2M3NmRjMjYnKQorICAgICAgICBzZWxmLmV4cGVjdEhpZGRlbihGYWxz ZSkKKyAgICAgICAgc2VsZi5leHBlY3RSZW1vdGVDb21tYW5kcygKKyAgICAgICAgICAgIEV4cGVj dFNoZWxsKHdvcmtkaXI9J3drZGlyJywKKyAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVvdXQ9 MTIwMCwKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydnaXQnLCAnY2hlY2tvdXQn LCAnMWEzNDI1Y2I5MmRiY2JjYTEyYTEwYWE5NTE0ZjFiNzdjNzZkYzI2J10sCisgICAgICAgICAg ICAgICAgICAgICAgICApCisgICAgICAgICAgICArIEV4cGVjdFNoZWxsLmxvZygnc3RkaW8nLCBz dGRvdXQ9J1VuZXhwZWN0ZWQgZmFpbHVyZScpCisgICAgICAgICAgICArIDIsCisgICAgICAgICkK KyAgICAgICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1GQUlMVVJFLCBzdGF0ZV9zdHJpbmc9 J0NoZWNrZWQgb3V0IHJlcXVpcmVkIHJldmlzaW9uIChmYWlsdXJlKScpCisgICAgICAgIHJldHVy biBzZWxmLnJ1blN0ZXAoKQorCisgICAgZGVmIHRlc3Rfc2tpcChzZWxmKToKKyAgICAgICAgc2Vs Zi5zZXR1cFN0ZXAoQ2hlY2tPdXRTcGVjaWZpY1JldmlzaW9uKCkpCisgICAgICAgIHNlbGYuZXhw ZWN0SGlkZGVuKFRydWUpCisgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9U0tJUFBF RCwgc3RhdGVfc3RyaW5nPSdDaGVja2VkIG91dCByZXF1aXJlZCByZXZpc2lvbiAoc2tpcHBlZCkn KQorICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKKworCiBjbGFzcyBUZXN0Q2xlYW5Xb3Jr aW5nRGlyZWN0b3J5KEJ1aWxkU3RlcE1peGluQWRkaXRpb25zLCB1bml0dGVzdC5UZXN0Q2FzZSk6 CiAgICAgZGVmIHNldFVwKHNlbGYpOgogICAgICAgICBzZWxmLmxvbmdNZXNzYWdlID0gVHJ1ZQo= 372579 2019-06-20 13:08:40 -0700 2019-06-20 13:36:17 -0700 Patch bug-198289-20190620160838.patch text/plain 7251 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NjY0NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDE5LTA2LTIwICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWJ1aWxkXSBUcmlnZ2VyZWQgYnVpbGRzIHNob3VsZCB1c2Ugc2Ft ZSByZXZpc2lvbiBhcyBwYXJlbnQgYnVpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE5ODI4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5 OgorICAgICAgICAoQ2hlY2tPdXRTcGVjaWZpY1JldmlzaW9uKTogQnVpbGQgc3RlcCB0byBjaGVj a291dCBzcGVjaWZpYyByZXZpc2lvbi4KKyAgICAgICAgKENoZWNrT3V0U3BlY2lmaWNSZXZpc2lv bi5kb1N0ZXBJZik6IFJ1biB0aGlzIHN0ZXAgb25seSBpZiBld3NfcmV2aXNpb24gcHJvcGVydHkg aXMgc2V0LgorICAgICAgICAoQ2hlY2tPdXRTcGVjaWZpY1JldmlzaW9uLmhpZGVTdGVwSWYpOiBI aWRlIHRoaXMgc3RlcCB3aGVuIGl0IGlzIHNraXBwZWQuCisgICAgICAgIChDaGVja091dFNwZWNp ZmljUmV2aXNpb24uc3RhcnQpOiBSdW4gYXBwcm9wcmlhdGUgZ2l0IGNvbW1hbmQuCisgICAgICAg IChUcmlnZ2VyLnByb3BlcnRpZXNUb1Bhc3NUb1RyaWdnZXJzKTogUGFzcyBld3NfcmV2aXNpb24g cHJvcGVydHkgdG8gdHJpZ2dlcmVkIGJ1aWxkcywgc28gdGhhdCB0cmlnZ2VyZWQKKyAgICAgICAg YnVpbGRzIHVzZSBzYW1lIHJldmlzaW9uIGFzIHBhcmVudCBidWlsZC4KKyAgICAgICAgKiBCdWls ZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHk6IEFkZGVkIHVuaXQtdGVz dHMuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weToK KyAgICAgICAgKEZhY3RvcnkuX19pbml0X18pOiBBZGRlZCBDaGVja091dFNwZWNpZmljUmV2aXNp b24gc3RlcC4KKwogMjAxOS0wNi0yMCAgQWxleGFuZGVyIE1pa2hheWxlbmtvICA8ZXhhbG03NjU5 QGdtYWlsLmNvbT4KIAogICAgICAgICBbR1RLXSBFbmFibGUgbmF2aWdhdGlvbiBzd2lwZSBsYXlv dXQgdGVzdHMKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3Jp ZXMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2Zh Y3Rvcmllcy5weQkocmV2aXNpb24gMjQ2NjQ2KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv ZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weQkod29ya2luZyBjb3B5KQpAQCAtMjQsOCArMjQsOCBAQAog ZnJvbSBidWlsZGJvdC5wcm9jZXNzIGltcG9ydCBmYWN0b3J5CiBmcm9tIGJ1aWxkYm90LnN0ZXBz IGltcG9ydCB0cmlnZ2VyCiAKLWZyb20gc3RlcHMgaW1wb3J0IChBcHBseVBhdGNoLCBDaGVja091 dFNvdXJjZSwgQ2hlY2tQYXRjaFJlbGV2YW5jZSwgQ2hlY2tTdHlsZSwKLSAgICAgICAgICAgICAg ICAgICBDb21waWxlSlNDT25seSwgQ29tcGlsZUpTQ09ubHlUb1QsIENvbXBpbGVXZWJLaXQsIENv bmZpZ3VyZUJ1aWxkLAorZnJvbSBzdGVwcyBpbXBvcnQgKEFwcGx5UGF0Y2gsIENoZWNrT3V0U291 cmNlLCBDaGVja091dFNwZWNpZmljUmV2aXNpb24sIENoZWNrUGF0Y2hSZWxldmFuY2UsCisgICAg ICAgICAgICAgICAgICAgQ2hlY2tTdHlsZSwgQ29tcGlsZUpTQ09ubHksIENvbXBpbGVKU0NPbmx5 VG9ULCBDb21waWxlV2ViS2l0LCBDb25maWd1cmVCdWlsZCwKICAgICAgICAgICAgICAgICAgICBE b3dubG9hZEJ1aWx0UHJvZHVjdCwgRXh0cmFjdEJ1aWx0UHJvZHVjdCwgS2lsbE9sZFByb2Nlc3Nl cywKICAgICAgICAgICAgICAgICAgICBQcmludENvbmZpZ3VyYXRpb24sIFJlUnVuSmF2YVNjcmlw dENvcmVUZXN0cywgUnVuQVBJVGVzdHMsIFJ1bkJpbmRpbmdzVGVzdHMsCiAgICAgICAgICAgICAg ICAgICAgUnVuSmF2YVNjcmlwdENvcmVUZXN0cywgUnVuSmF2YVNjcmlwdENvcmVUZXN0c1RvVCwg UnVuV2ViS2l0MVRlc3RzLCBSdW5XZWJLaXRQZXJsVGVzdHMsCkBAIC00MSw2ICs0MSwxMCBAQCBj bGFzcyBGYWN0b3J5KGZhY3RvcnkuQnVpbGRGYWN0b3J5KToKICAgICAgICAgc2VsZi5hZGRTdGVw KFZhbGlkYXRlUGF0Y2goKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKFByaW50Q29uZmlndXJhdGlv bigpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoQ2hlY2tPdXRTb3VyY2UoKSkKKyAgICAgICAgIyBD aGVja091dFNvdXJjZSBzdGVwIHB1bGxzIHRoZSBsYXRlc3QgcmV2aXNpb24sIHNpbmNlIHdlIHVz ZSBhbHdheXNVc2VMYXRlc3Q9VHJ1ZS4gV2l0aG91dCBhbHdheXNVc2VMYXRlc3QgQnVpbGRib3Qg d2lsbAorICAgICAgICAjIGF1dG9tYXRpY2FsbHkgYXBwbHkgdGhlIHBhdGNoIHRvIHRoZSByZXBv LCBhbmQgdGhhdCBkb2Vzbid0IGhhbmRsZSBDaGFuZ2VMb2dzIHdlbGwuIFNlZSBodHRwczovL3dl YmtpdC5vcmcvYi8xOTMxMzgKKyAgICAgICAgIyBUaGVyZWZvcmUgd2UgYWRkIENoZWNrT3V0U3Bl Y2lmaWNSZXZpc2lvbiBzdGVwIHRvIGNoZWNrb3V0IHJlcXVpcmVkIHJldmlzaW9uLgorICAgICAg ICBzZWxmLmFkZFN0ZXAoQ2hlY2tPdXRTcGVjaWZpY1JldmlzaW9uKCkpCiAgICAgICAgIHNlbGYu YWRkU3RlcChBcHBseVBhdGNoKCkpCiAKIApJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv ZXdzLWJ1aWxkL3N0ZXBzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2V3cy1idWlsZC9zdGVwcy5weQkocmV2aXNpb24gMjQ2NjQ2KQorKysgVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMDcsNiArMTA3 LDIzIEBAIGNsYXNzIENoZWNrT3V0U291cmNlKGdpdC5HaXQpOgogICAgICAgICAgICAgcmV0dXJu IHt1J3N0ZXAnOiB1J0NsZWFuZWQgYW5kIHVwZGF0ZWQgd29ya2luZyBkaXJlY3RvcnknfQogCiAK K2NsYXNzIENoZWNrT3V0U3BlY2lmaWNSZXZpc2lvbihzaGVsbC5TaGVsbENvbW1hbmQpOgorICAg IG5hbWUgPSAnY2hlY2tvdXQtc3BlY2lmaWMtcmV2aXNpb24nCisgICAgZGVzY3JpcHRpb25Eb25l ID0gWydDaGVja2VkIG91dCByZXF1aXJlZCByZXZpc2lvbiddCisgICAgZmx1bmtPbkZhaWx1cmUg PSBGYWxzZQorICAgIGhhbHRPbkZhaWx1cmUgPSBGYWxzZQorCisgICAgZGVmIGRvU3RlcElmKHNl bGYsIHN0ZXApOgorICAgICAgICByZXR1cm4gc2VsZi5nZXRQcm9wZXJ0eSgnZXdzX3JldmlzaW9u JywgRmFsc2UpCisKKyAgICBkZWYgaGlkZVN0ZXBJZihzZWxmLCByZXN1bHRzLCBzdGVwKToKKyAg ICAgICAgcmV0dXJuIG5vdCBzZWxmLmRvU3RlcElmKHN0ZXApCisKKyAgICBkZWYgc3RhcnQoc2Vs Zik6CisgICAgICAgIHNlbGYuc2V0Q29tbWFuZChbJ2dpdCcsICdjaGVja291dCcsIHNlbGYuZ2V0 UHJvcGVydHkoJ2V3c19yZXZpc2lvbicpXSkKKyAgICAgICAgcmV0dXJuIHNoZWxsLlNoZWxsQ29t bWFuZC5zdGFydChzZWxmKQorCisKIGNsYXNzIENsZWFuV29ya2luZ0RpcmVjdG9yeShzaGVsbC5T aGVsbENvbW1hbmQpOgogICAgIG5hbWUgPSAnY2xlYW4td29ya2luZy1kaXJlY3RvcnknCiAgICAg ZGVzY3JpcHRpb24gPSBbJ2NsZWFuLXdvcmtpbmctZGlyZWN0b3J5IHJ1bm5pbmcnXQpAQCAtNDA0 LDYgKzQyMSw3IEBAIGNsYXNzIFRyaWdnZXIodHJpZ2dlci5UcmlnZ2VyKToKICAgICAgICAgICAg ICdmdWxsUGxhdGZvcm0nOiBwcm9wZXJ0aWVzLlByb3BlcnR5KCdmdWxsUGxhdGZvcm0nKSwKICAg ICAgICAgICAgICdhcmNoaXRlY3R1cmUnOiBwcm9wZXJ0aWVzLlByb3BlcnR5KCdhcmNoaXRlY3R1 cmUnKSwKICAgICAgICAgICAgICdvd25lcic6IHByb3BlcnRpZXMuUHJvcGVydHkoJ293bmVyJyks CisgICAgICAgICAgICAnZXdzX3JldmlzaW9uJzogcHJvcGVydGllcy5Qcm9wZXJ0eSgnZ290X3Jl dmlzaW9uJyksCiAgICAgICAgIH0KIAogCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9l d3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNDY2NDYpCisr KyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkJKHdv cmtpbmcgY29weSkKQEAgLTM1LDcgKzM1LDcgQEAgZnJvbSB0d2lzdGVkLnB5dGhvbiBpbXBvcnQg ZmFpbHVyZSwgbG9nCiBmcm9tIHR3aXN0ZWQudHJpYWwgaW1wb3J0IHVuaXR0ZXN0CiAKIGZyb20g c3RlcHMgaW1wb3J0IChBbmFseXplQVBJVGVzdHNSZXN1bHRzLCBBcHBseVBhdGNoLCBBcmNoaXZl QnVpbHRQcm9kdWN0LCBBcmNoaXZlVGVzdFJlc3VsdHMsCi0gICAgICAgICAgICAgICAgICAgQ2hl Y2tPdXRTb3VyY2UsIENoZWNrUGF0Y2hSZWxldmFuY2UsIENoZWNrU3R5bGUsIENsZWFuQnVpbGQs IENsZWFuV29ya2luZ0RpcmVjdG9yeSwKKyAgICAgICAgICAgICAgICAgICBDaGVja091dFNvdXJj ZSwgQ2hlY2tPdXRTcGVjaWZpY1JldmlzaW9uLCBDaGVja1BhdGNoUmVsZXZhbmNlLCBDaGVja1N0 eWxlLCBDbGVhbkJ1aWxkLCBDbGVhbldvcmtpbmdEaXJlY3RvcnksCiAgICAgICAgICAgICAgICAg ICAgQ29tcGlsZUpTQ09ubHksIENvbXBpbGVKU0NPbmx5VG9ULCBDb21waWxlV2ViS2l0LCBDb21w aWxlV2ViS2l0VG9ULCBDb25maWd1cmVCdWlsZCwKICAgICAgICAgICAgICAgICAgICBEb3dubG9h ZEJ1aWx0UHJvZHVjdCwgRXh0cmFjdEJ1aWx0UHJvZHVjdCwgRXh0cmFjdFRlc3RSZXN1bHRzLCBL aWxsT2xkUHJvY2Vzc2VzLAogICAgICAgICAgICAgICAgICAgIFByaW50Q29uZmlndXJhdGlvbiwg UmVSdW5BUElUZXN0cywgUmVSdW5KYXZhU2NyaXB0Q29yZVRlc3RzLCBSdW5BUElUZXN0cywgUnVu QVBJVGVzdHNXaXRob3V0UGF0Y2gsCkBAIC04MzYsNiArODM2LDUwIEBAIGNsYXNzIFRlc3RSdW5X ZWJLaXQxVGVzdHMoQnVpbGRTdGVwTWl4aW4KICAgICAgICAgcmV0dXJuIHNlbGYucnVuU3RlcCgp CiAKIAorY2xhc3MgVGVzdENoZWNrT3V0U3BlY2lmaWNSZXZpc2lvbihCdWlsZFN0ZXBNaXhpbkFk ZGl0aW9ucywgdW5pdHRlc3QuVGVzdENhc2UpOgorICAgIGRlZiBzZXRVcChzZWxmKToKKyAgICAg ICAgc2VsZi5sb25nTWVzc2FnZSA9IFRydWUKKyAgICAgICAgcmV0dXJuIHNlbGYuc2V0VXBCdWls ZFN0ZXAoKQorCisgICAgZGVmIHRlYXJEb3duKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi50 ZWFyRG93bkJ1aWxkU3RlcCgpCisKKyAgICBkZWYgdGVzdF9zdWNjZXNzKHNlbGYpOgorICAgICAg ICBzZWxmLnNldHVwU3RlcChDaGVja091dFNwZWNpZmljUmV2aXNpb24oKSkKKyAgICAgICAgc2Vs Zi5zZXRQcm9wZXJ0eSgnZXdzX3JldmlzaW9uJywgJzFhMzQyNWNiOTJkYmNiY2ExMmExMGFhOTUx NGYxYjc3Yzc2ZGMyNicpCisgICAgICAgIHNlbGYuZXhwZWN0SGlkZGVuKEZhbHNlKQorICAgICAg ICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAorICAgICAgICAgICAgRXhwZWN0U2hlbGwod29y a2Rpcj0nd2tkaXInLAorICAgICAgICAgICAgICAgICAgICAgICAgdGltZW91dD0xMjAwLAorICAg ICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ2dpdCcsICdjaGVja291dCcsICcxYTM0MjVj YjkyZGJjYmNhMTJhMTBhYTk1MTRmMWI3N2M3NmRjMjYnXSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICkKKyAgICAgICAgICAgICsgMCwKKyAgICAgICAgKQorICAgICAgICBzZWxmLmV4cGVjdE91 dGNvbWUocmVzdWx0PVNVQ0NFU1MsIHN0YXRlX3N0cmluZz0nQ2hlY2tlZCBvdXQgcmVxdWlyZWQg cmV2aXNpb24nKQorICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKKworICAgIGRlZiB0ZXN0 X2ZhaWx1cmUoc2VsZik6CisgICAgICAgIHNlbGYuc2V0dXBTdGVwKENoZWNrT3V0U3BlY2lmaWNS ZXZpc2lvbigpKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdld3NfcmV2aXNpb24nLCAnMWEz NDI1Y2I5MmRiY2JjYTEyYTEwYWE5NTE0ZjFiNzdjNzZkYzI2JykKKyAgICAgICAgc2VsZi5leHBl Y3RIaWRkZW4oRmFsc2UpCisgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCisgICAg ICAgICAgICBFeHBlY3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCisgICAgICAgICAgICAgICAgICAg ICAgICB0aW1lb3V0PTEyMDAsCisgICAgICAgICAgICAgICAgICAgICAgICBjb21tYW5kPVsnZ2l0 JywgJ2NoZWNrb3V0JywgJzFhMzQyNWNiOTJkYmNiY2ExMmExMGFhOTUxNGYxYjc3Yzc2ZGMyNidd LAorICAgICAgICAgICAgICAgICAgICAgICAgKQorICAgICAgICAgICAgKyBFeHBlY3RTaGVsbC5s b2coJ3N0ZGlvJywgc3Rkb3V0PSdVbmV4cGVjdGVkIGZhaWx1cmUnKQorICAgICAgICAgICAgKyAy LAorICAgICAgICApCisgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9RkFJTFVSRSwg c3RhdGVfc3RyaW5nPSdDaGVja2VkIG91dCByZXF1aXJlZCByZXZpc2lvbiAoZmFpbHVyZSknKQor ICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKKworICAgIGRlZiB0ZXN0X3NraXAoc2VsZik6 CisgICAgICAgIHNlbGYuc2V0dXBTdGVwKENoZWNrT3V0U3BlY2lmaWNSZXZpc2lvbigpKQorICAg ICAgICBzZWxmLmV4cGVjdEhpZGRlbihUcnVlKQorICAgICAgICBzZWxmLmV4cGVjdE91dGNvbWUo cmVzdWx0PVNLSVBQRUQsIHN0YXRlX3N0cmluZz0nQ2hlY2tlZCBvdXQgcmVxdWlyZWQgcmV2aXNp b24gKHNraXBwZWQpJykKKyAgICAgICAgcmV0dXJuIHNlbGYucnVuU3RlcCgpCisKKwogY2xhc3Mg VGVzdENsZWFuV29ya2luZ0RpcmVjdG9yeShCdWlsZFN0ZXBNaXhpbkFkZGl0aW9ucywgdW5pdHRl c3QuVGVzdENhc2UpOgogICAgIGRlZiBzZXRVcChzZWxmKToKICAgICAgICAgc2VsZi5sb25nTWVz c2FnZSA9IFRydWUK