<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[282040] trunk/Tools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/282040">282040</a></dd>
<dt>Author</dt> <dd>aakash_jain@apple.com</dd>
<dt>Date</dt> <dd>2021-09-03 17:32:37 -0700 (Fri, 03 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[ews] Invoke validate-changelog with python 3
https://bugs.webkit.org/show_bug.cgi?id=229872

Reviewed by Jonathan Bedard.

* CISupport/ews-build/steps.py:
(ValidateChangeLogAndReviewer):
* CISupport/ews-build/steps_unittest.py: Added unit-tests.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsCISupportewsbuildstepspy">trunk/Tools/CISupport/ews-build/steps.py</a></li>
<li><a href="#trunkToolsCISupportewsbuildsteps_unittestpy">trunk/Tools/CISupport/ews-build/steps_unittest.py</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsCISupportewsbuildstepspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/CISupport/ews-build/steps.py (282039 => 282040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/CISupport/ews-build/steps.py 2021-09-04 00:29:35 UTC (rev 282039)
+++ trunk/Tools/CISupport/ews-build/steps.py    2021-09-04 00:32:37 UTC (rev 282040)
</span><span class="lines">@@ -1009,7 +1009,7 @@
</span><span class="cx"> class ValidateChangeLogAndReviewer(shell.ShellCommand):
</span><span class="cx">     name = 'validate-changelog-and-reviewer'
</span><span class="cx">     descriptionDone = ['Validated ChangeLog and Reviewer']
</span><del>-    command = ['python', 'Tools/Scripts/webkit-patch', 'validate-changelog', '--check-oops', '--non-interactive']
</del><ins>+    command = ['python3', 'Tools/Scripts/webkit-patch', 'validate-changelog', '--check-oops', '--non-interactive']
</ins><span class="cx">     haltOnFailure = False
</span><span class="cx">     flunkOnFailure = True
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsCISupportewsbuildsteps_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (282039 => 282040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/CISupport/ews-build/steps_unittest.py        2021-09-04 00:29:35 UTC (rev 282039)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py   2021-09-04 00:32:37 UTC (rev 282040)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">                    RunWebKitPyPython3Tests, RunWebKitTests, RunWebKitTestsInStressMode, RunWebKitTestsInStressGuardmallocMode,
</span><span class="cx">                    RunWebKitTestsWithoutPatch, TestWithFailureCount, ShowIdentifier,
</span><span class="cx">                    Trigger, TransferToS3, UnApplyPatchIfRequired, UpdateWorkingDirectory, UploadBuiltProduct,
</span><del>-                   UploadTestResults, ValidateCommiterAndReviewer, ValidatePatch, VerifyGitHubIntegrity)
</del><ins>+                   UploadTestResults, ValidateChangeLogAndReviewer, ValidateCommiterAndReviewer, ValidatePatch, VerifyGitHubIntegrity)
</ins><span class="cx"> 
</span><span class="cx"> # Workaround for https://github.com/buildbot/buildbot/issues/4669
</span><span class="cx"> from buildbot.test.fake.fakebuild import FakeBuild
</span><span class="lines">@@ -359,6 +359,43 @@
</span><span class="cx">         return self.runStep()
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+class TestValidateChangeLogAndReviewer(BuildStepMixinAdditions, unittest.TestCase):
+    def setUp(self):
+        self.longMessage = True
+        return self.setUpBuildStep()
+
+    def tearDown(self):
+        return self.tearDownBuildStep()
+
+    def test_success(self):
+        self.setupStep(ValidateChangeLogAndReviewer())
+        self.expectRemoteCommands(
+            ExpectShell(workdir='wkdir',
+                        timeout=180,
+                        logEnviron=False,
+                        command=['python3', 'Tools/Scripts/webkit-patch', 'validate-changelog', '--check-oops', '--non-interactive'])
+            + 0,
+        )
+        self.expectOutcome(result=SUCCESS, state_string='Validated ChangeLog and Reviewer')
+        return self.runStep()
+
+    def test_failure(self):
+        self.setupStep(ValidateChangeLogAndReviewer())
+        self.expectRemoteCommands(
+            ExpectShell(workdir='wkdir',
+                        timeout=180,
+                        logEnviron=False,
+                        command=['python3', 'Tools/Scripts/webkit-patch', 'validate-changelog', '--check-oops', '--non-interactive'])
+            + ExpectShell.log('stdio', stdout='ChangeLog entry in LayoutTests/ChangeLog contains OOPS!.')
+            + 2,
+        )
+        self.expectOutcome(result=FAILURE, state_string='ChangeLog validation failed')
+        rc = self.runStep()
+        self.assertEqual(self.getProperty('bugzilla_comment_text'), 'ChangeLog entry in LayoutTests/ChangeLog contains OOPS!.\n')
+        self.assertEqual(self.getProperty('build_finish_summary'), 'ChangeLog validation failed')
+        return rc
+
+
</ins><span class="cx"> class TestRunBindingsTests(BuildStepMixinAdditions, unittest.TestCase):
</span><span class="cx">     def setUp(self):
</span><span class="cx">         self.longMessage = True
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (282039 => 282040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-09-04 00:29:35 UTC (rev 282039)
+++ trunk/Tools/ChangeLog       2021-09-04 00:32:37 UTC (rev 282040)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-09-03  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews] Invoke validate-changelog with python 3
+        https://bugs.webkit.org/show_bug.cgi?id=229872
+
+        Reviewed by Jonathan Bedard.
+
+        * CISupport/ews-build/steps.py:
+        (ValidateChangeLogAndReviewer):
+        * CISupport/ews-build/steps_unittest.py: Added unit-tests.
+
</ins><span class="cx"> 2021-09-03  Kate Cheney  <katherine_cheney@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Safari‚Äôs Privacy Report window is completely blank
</span></span></pre>
</div>
</div>

</body>
</html>