Title: [258637] trunk/Tools
- Revision
- 258637
- Author
- [email protected]
- Date
- 2020-03-18 08:35:05 -0700 (Wed, 18 Mar 2020)
Log Message
[ews] commit-queue should comment on bug in case patch fails to build
https://bugs.webkit.org/show_bug.cgi?id=209227
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(AnalyzeCompileWebKitResults.start):
* BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-test.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (258636 => 258637)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-03-18 15:31:18 UTC (rev 258636)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-03-18 15:35:05 UTC (rev 258637)
@@ -1332,9 +1332,15 @@
self.finished(FAILURE)
self.build.results = FAILURE
- message = 'Patch does not build'
+ patch_id = self.getProperty('patch_id', '')
+ message = 'Patch {} does not build'.format(patch_id)
self.descriptionDone = message
- self.build.buildFinished([message], FAILURE)
+ if self.getProperty('buildername', '').lower() == 'commit-queue':
+ self.setProperty('bugzilla_comment_text', message)
+ self.setProperty('build_finish_summary', message)
+ self.build.addStepsAfterCurrentStep([CommentOnBug(), SetCommitQueueMinusFlagOnPatch()])
+ else:
+ self.build.buildFinished([message], FAILURE)
return defer.succeed(None)
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (258636 => 258637)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2020-03-18 15:31:18 UTC (rev 258636)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2020-03-18 15:35:05 UTC (rev 258637)
@@ -1061,9 +1061,27 @@
mock_step(CompileWebKitToT(), results=SUCCESS),
]
self.setupStep(AnalyzeCompileWebKitResults(), previous_steps=previous_steps)
- self.expectOutcome(result=FAILURE, state_string='Patch does not build (failure)')
- return self.runStep()
+ self.setProperty('patch_id', '1234')
+ self.expectOutcome(result=FAILURE, state_string='Patch 1234 does not build (failure)')
+ rc = self.runStep()
+ self.assertEqual(self.getProperty('bugzilla_comment_text'), None)
+ self.assertEqual(self.getProperty('build_finish_summary'), None)
+ return rc
+ def test_patch_with_build_failure_on_commit_queue(self):
+ previous_steps = [
+ mock_step(CompileWebKit(), results=FAILURE),
+ mock_step(CompileWebKitToT(), results=SUCCESS),
+ ]
+ self.setupStep(AnalyzeCompileWebKitResults(), previous_steps=previous_steps)
+ self.setProperty('patch_id', '1234')
+ self.setProperty('buildername', 'commit-queue')
+ self.expectOutcome(result=FAILURE, state_string='Patch 1234 does not build (failure)')
+ rc = self.runStep()
+ self.assertEqual(self.getProperty('bugzilla_comment_text'), 'Patch 1234 does not build')
+ self.assertEqual(self.getProperty('build_finish_summary'), 'Patch 1234 does not build')
+ return rc
+
def test_patch_with_ToT_failure(self):
previous_steps = [
mock_step(CompileWebKit(), results=FAILURE),
Modified: trunk/Tools/ChangeLog (258636 => 258637)
--- trunk/Tools/ChangeLog 2020-03-18 15:31:18 UTC (rev 258636)
+++ trunk/Tools/ChangeLog 2020-03-18 15:35:05 UTC (rev 258637)
@@ -1,3 +1,14 @@
+2020-03-18 Aakash Jain <[email protected]>
+
+ [ews] commit-queue should comment on bug in case patch fails to build
+ https://bugs.webkit.org/show_bug.cgi?id=209227
+
+ Reviewed by Jonathan Bedard.
+
+ * BuildSlaveSupport/ews-build/steps.py:
+ (AnalyzeCompileWebKitResults.start):
+ * BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-test.
+
2020-03-18 Philippe Normand <[email protected]>
[GTK][WPE] Migrate to Flatpak-based dev SDK
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
