Title: [272238] trunk/Tools
- Revision
- 272238
- Author
- [email protected]
- Date
- 2021-02-02 14:38:24 -0800 (Tue, 02 Feb 2021)
Log Message
[ews] Commit queue failure message should indicate that cq+ flag can be set again
https://bugs.webkit.org/show_bug.cgi?id=221269
Reviewed by Jonathan Bedard.
* CISupport/ews-build/steps.py:
(PushCommitToWebKitRepo.comment_text_for_bug):
* CISupport/ews-build/steps_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (272237 => 272238)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-02-02 22:34:32 UTC (rev 272237)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-02-02 22:38:24 UTC (rev 272238)
@@ -3111,7 +3111,9 @@
def comment_text_for_bug(self, svn_revision=None):
patch_id = self.getProperty('patch_id', '')
if not svn_revision:
- return 'commit-queue failed to commit attachment {} to WebKit repository.'.format(patch_id)
+ comment = 'commit-queue failed to commit attachment {} to WebKit repository.'.format(patch_id)
+ comment += ' To retry, please set cq+ flag again.'
+ return comment
comment = 'Committed r{}: <{}>'.format(svn_revision, self.url_for_revision(svn_revision))
comment += '\n\nAll reviewed patches have been landed. Closing bug and clearing flags on attachment {}.'.format(patch_id)
return comment
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (272237 => 272238)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-02-02 22:34:32 UTC (rev 272237)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-02-02 22:38:24 UTC (rev 272238)
@@ -3738,6 +3738,7 @@
def test_success(self):
self.setupStep(PushCommitToWebKitRepo())
+ self.setProperty('patch_id', '1234')
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
timeout=300,
@@ -3747,10 +3748,14 @@
0,
)
self.expectOutcome(result=SUCCESS, state_string='Committed r256729')
- return self.runStep()
+ rc = self.runStep()
+ self.assertEqual(self.getProperty('bugzilla_comment_text'), 'Committed r256729: <https://trac.webkit.org/changeset/256729>\n\nAll reviewed patches have been landed. Closing bug and clearing flags on attachment 1234.')
+ self.assertEqual(self.getProperty('build_finish_summary'), None)
+ return rc
def test_failure(self):
self.setupStep(PushCommitToWebKitRepo())
+ self.setProperty('patch_id', '2345')
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
timeout=300,
@@ -3760,7 +3765,10 @@
2,
)
self.expectOutcome(result=FAILURE, state_string='Failed to push commit to Webkit repository')
- return self.runStep()
+ rc = self.runStep()
+ self.assertEqual(self.getProperty('build_finish_summary'), 'Failed to commit to WebKit repository')
+ self.assertEqual(self.getProperty('bugzilla_comment_text'), 'commit-queue failed to commit attachment 2345 to WebKit repository. To retry, please set cq+ flag again.')
+ return rc
class TestShowIdentifier(BuildStepMixinAdditions, unittest.TestCase):
Modified: trunk/Tools/ChangeLog (272237 => 272238)
--- trunk/Tools/ChangeLog 2021-02-02 22:34:32 UTC (rev 272237)
+++ trunk/Tools/ChangeLog 2021-02-02 22:38:24 UTC (rev 272238)
@@ -1,3 +1,14 @@
+2021-02-02 Aakash Jain <[email protected]>
+
+ [ews] Commit queue failure message should indicate that cq+ flag can be set again
+ https://bugs.webkit.org/show_bug.cgi?id=221269
+
+ Reviewed by Jonathan Bedard.
+
+ * CISupport/ews-build/steps.py:
+ (PushCommitToWebKitRepo.comment_text_for_bug):
+ * CISupport/ews-build/steps_unittest.py:
+
2021-02-02 Don Olmstead <[email protected]>
[webkitpy] WinPort.delete_sem_locks is cygwin specific
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
