Changeset 269786 in webkit

Timestamp:

Nov 13, 2020, 10:22:32 AM (6 years ago)

Author:

aakash_jain@apple.com

Message:

[build.webkit.org] Update RunAPITests step for new buildbot
​https://bugs.webkit.org/show_bug.cgi?id=218907

Reviewed by Jonathan Bedard.

• CISupport/build-webkit-org/steps.py:

(TestWithFailureCount.getText): Added FIXME to remove this method after switching to buildbot v2.
(TestWithFailureCount.getText2): Added FIXME to remove this method after switching to buildbot v2.
(TestWithFailureCount.getResultSummary): Method to generate custom step summary.
(RunWebKitTests.getResultSummary): Removed unnecessary u, python3 defaults to unicode anyways.
(RunAPITests):
(RunAPITests.start): Use ParseByLineLogObserver.
(RunAPITests.countFailures):
(RunAPITests.parseOutputLine): Method to process each line.

Location:

trunk/Tools

Files:

• CISupport/build-webkit-org/steps.py (modified) (7 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/CISupport/build-webkit-org/steps.py

@@ -45 +45 @@
     Interpolate = properties.Interpolate
     from buildbot.process import logobserver
+    from buildbot.process.results import Results
     from buildbot.steps.source.svn import SVN
 else:
@@ -92 +93 @@
 
     def getText(self, cmd, results):
+        # FIXME: delete this method after switching to Buildbot v2
         return self.getText2(cmd, results)
 
     def getText2(self, cmd, results):
+        # FIXME: delete this method after switching to Buildbot v2
         if results != SUCCESS and self.failedTestCount:
             return [self.failedTestsFormatString % (self.failedTestCount, self.failedTestPluralSuffix)]
 
         return [self.name]
+
+    def getResultSummary(self):
+        status = self.name
+
+        if self.results != SUCCESS:
+            if self.failedTestCount:
+                status = self.failedTestsFormatString % (self.failedTestCount, self.failedTestPluralSuffix)
+            else:
+                status += ' ({})'.format(Results[self.results])
+
+        return {'step': status}
 
 
@@ -618 +632 @@
 
         if self.results != SUCCESS and self.incorrectLayoutLines:
-            status = u' '.join(self.incorrectLayoutLines)
-            return {u'step': status}
+            status = ' '.join(self.incorrectLayoutLines)
+            return {'step': status}
         return super(RunWebKitTests, self).getResultSummary()
 
@@ -665 +679 @@
     ]
     failedTestsFormatString = "%d api test%s failed or timed out"
+    test_summary_re = re.compile(r'Ran (?P<ran>\d+) tests of (?P<total>\d+) with (?P<passed>\d+) successful')
 
     def __init__(self, *args, **kwargs):
@@ -673 +688 @@
         if USE_BUILDBOT_VERSION2:
             self.workerEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
+            self.log_observer = ParseByLineLogObserver(self.parseOutputLine)
+            self.addLogObserver('stdio', self.log_observer)
+            self.failedTestCount = 0
         else:
             self.slaveEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
@@ -679 +697 @@
 
     def countFailures(self, cmd):
+        if USE_BUILDBOT_VERSION2:
+            return self.failedTestCount
+
         log_text = cmd.logs['stdio'].getText()
 
@@ -685 +706 @@
             return -1
         return int(match.group('ran')) - int(match.group('passed'))
+
+    def parseOutputLine(self, line):
+        match = self.test_summary_re.match(line)
+        if match:
+            self.failedTestCount = int(match.group('ran')) - int(match.group('passed'))
 
 

trunk/Tools/ChangeLog

@@ +1 @@
+2020-11-13  Aakash Jain  <aakash_jain@apple.com>
+
+        [build.webkit.org] Update RunAPITests step for new buildbot
+        https://bugs.webkit.org/show_bug.cgi?id=218907
+
+        Reviewed by Jonathan Bedard.
+
+        * CISupport/build-webkit-org/steps.py:
+        (TestWithFailureCount.getText): Added FIXME to remove this method after switching to buildbot v2.
+        (TestWithFailureCount.getText2): Added FIXME to remove this method after switching to buildbot v2.
+        (TestWithFailureCount.getResultSummary): Method to generate custom step summary.
+        (RunWebKitTests.getResultSummary): Removed unnecessary u'', python3 defaults to unicode anyways.
+        (RunAPITests):
+        (RunAPITests.start): Use ParseByLineLogObserver.
+        (RunAPITests.countFailures):
+        (RunAPITests.parseOutputLine): Method to process each line.
+
 2020-11-12  Darin Adler  <darin@apple.com>