Changeset 258652 in webkit

Timestamp:

Mar 18, 2020 11:15:34 AM (4 years ago)

Author:

aakash_jain@apple.com

Message:

[ews] commit-queue should comment on bug in case of test failures
​https://bugs.webkit.org/show_bug.cgi?id=209226

Reviewed by Jonathan Bedard.

• BuildSlaveSupport/ews-build/steps.py:

(AnalyzeLayoutTestsResults.report_failure): Comment on bug and set cq- in case of test failure on commit-queue.
(BuildLogLineObserver.outLineReceived): Drive-by fix to use single quotes instead of double quotes.
(SetBuildSummary): Ditto.

• BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-test.

Location:

trunk/Tools

Files:

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

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

@@ -1209 +1209 @@
             self.error_context_buffer.append(line)
 
-        if "rror:" in line and self.errorReceived:
+        if 'rror:' in line and self.errorReceived:
             map(self.errorReceived, self.error_context_buffer)
             self.error_context_buffer = []
@@ -1827 +1827 @@
         message = 'Found {} new test failure{}: {}'.format(len(new_failures), pluralSuffix, new_failures_string)
         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)
 
@@ -2422 +2428 @@
 
 class SetBuildSummary(buildstep.BuildStep):
-    name = "set-build-summary"
+    name = 'set-build-summary'
     descriptionDone = ['Set build summary']
     alwaysRun = True

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

@@ -1823 +1823 @@
     def test_flaky_and_consistent_failures_without_clean_tree_failures(self):
         self.configureStep()
+        self.setProperty('buildername', 'iOS-13-Simulator-WK2-Tests-EWS')
         self.setProperty('first_run_failures', ['test1', 'test2'])
         self.setProperty('second_run_failures', ['test1'])
         self.expectOutcome(result=FAILURE, state_string='Found 1 new test failure: test1 (failure)')
-        return self.runStep()
+        rc = self.runStep()
+        self.assertEqual(self.getProperty('bugzilla_comment_text'), None)
+        self.assertEqual(self.getProperty('build_finish_summary'), None)
+        return rc
+
+    def test_consistent_failure_without_clean_tree_failures_commit_queue(self):
+        self.configureStep()
+        self.setProperty('buildername', 'Commit-Queue')
+        self.setProperty('first_run_failures', ['test1'])
+        self.setProperty('second_run_failures', ['test1'])
+        self.expectOutcome(result=FAILURE, state_string='Found 1 new test failure: test1 (failure)')
+        rc = self.runStep()
+        self.assertEqual(self.getProperty('bugzilla_comment_text'), 'Found 1 new test failure: test1')
+        self.assertEqual(self.getProperty('build_finish_summary'), 'Found 1 new test failure: test1')
+        return rc
 
     def test_flaky_and_inconsistent_failures_without_clean_tree_failures(self):

trunk/Tools/ChangeLog

@@ +1 @@
+2020-03-18  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews] commit-queue should comment on bug in case of test failures
+        https://bugs.webkit.org/show_bug.cgi?id=209226
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/ews-build/steps.py:
+        (AnalyzeLayoutTestsResults.report_failure): Comment on bug and set cq- in case of test failure on commit-queue.
+        (BuildLogLineObserver.outLineReceived): Drive-by fix to use single quotes instead of double quotes.
+        (SetBuildSummary): Ditto.
+        * BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-test.
+
 2020-03-18  Philippe Normand  <pnormand@igalia.com>