Changeset 258637 in webkit

Timestamp:

Mar 18, 2020 8:35:05 AM (4 years ago)

Author:

aakash_jain@apple.com

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.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-build/steps.py (modified) (1 diff)
• BuildSlaveSupport/ews-build/steps_unittest.py (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-build/steps.py

@@ -1333 +1333 @@
         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)

trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py

@@ -1062 +1062 @@
         ]
         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):

trunk/Tools/ChangeLog

@@ +1 @@
+2020-03-18  Aakash Jain  <aakash_jain@apple.com>
+
+        [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  <pnormand@igalia.com>