[ews-build] Make descriptionDone messages more readable
authoraakash_jain@apple.com <aakash_jain@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Mar 2019 22:08:53 +0000 (22:08 +0000)
committeraakash_jain@apple.com <aakash_jain@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Mar 2019 22:08:53 +0000 (22:08 +0000)
https://bugs.webkit.org/show_bug.cgi?id=195760

Reviewed by Lucas Forschler.

* BuildSlaveSupport/ews-build/steps.py:
* BuildSlaveSupport/ews-build/steps_unittest.py:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242969 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/BuildSlaveSupport/ews-build/steps.py
Tools/BuildSlaveSupport/ews-build/steps_unittest.py
Tools/ChangeLog

index accfe50..0b2d7e5 100644 (file)
@@ -40,7 +40,7 @@ Interpolate = properties.Interpolate
 class ConfigureBuild(buildstep.BuildStep):
     name = "configure-build"
     description = ["configuring build"]
-    descriptionDone = ["configured build"]
+    descriptionDone = ["Configured build"]
 
     def __init__(self, platform, configuration, architectures, buildOnly, additionalArguments):
         super(ConfigureBuild, self).__init__()
@@ -99,7 +99,7 @@ class CheckOutSource(git.Git):
 class CleanWorkingDirectory(shell.ShellCommand):
     name = 'clean-working-directory'
     description = ['clean-working-directory running']
-    descriptionDone = ['clean-working-directory']
+    descriptionDone = ['Cleaned working directory']
     flunkOnFailure = True
     haltOnFailure = True
     command = ['Tools/Scripts/clean-webkit']
@@ -108,7 +108,7 @@ class CleanWorkingDirectory(shell.ShellCommand):
 class ApplyPatch(shell.ShellCommand, CompositeStepMixin):
     name = 'apply-patch'
     description = ['applying-patch']
-    descriptionDone = ['apply-patch']
+    descriptionDone = ['Applied patch']
     flunkOnFailure = True
     haltOnFailure = True
     command = ['Tools/Scripts/svn-apply', '--force', '.buildbot-diff']
@@ -133,7 +133,7 @@ class ApplyPatch(shell.ShellCommand, CompositeStepMixin):
 class CheckPatchRelevance(buildstep.BuildStep):
     name = 'check-patch-relevance'
     description = ['check-patch-relevance running']
-    descriptionDone = ['check-patch-relevance']
+    descriptionDone = ['Checked patch relevance']
     flunkOnFailure = True
     haltOnFailure = True
 
@@ -224,7 +224,7 @@ class CheckPatchRelevance(buildstep.BuildStep):
 class ValidatePatch(buildstep.BuildStep):
     name = 'validate-patch'
     description = ['validate-patch running']
-    descriptionDone = ['validate-patch']
+    descriptionDone = ['Validated patch']
     flunkOnFailure = True
     haltOnFailure = True
     bug_open_statuses = ["UNCONFIRMED", "NEW", "ASSIGNED", "REOPENED"]
@@ -362,6 +362,7 @@ class ValidatePatch(buildstep.BuildStep):
 
 class UnApplyPatchIfRequired(CleanWorkingDirectory):
     name = 'unapply-patch'
+    descriptionDone = ['Unapplied patch']
 
     def doStepIf(self, step):
         return self.getProperty('patchFailedToBuild') or self.getProperty('patchFailedJSCTests')
@@ -473,7 +474,7 @@ def appendCustomBuildFlags(step, platform, fullPlatform):
 class CompileWebKit(shell.Compile):
     name = "compile-webkit"
     description = ["compiling"]
-    descriptionDone = ["compiled"]
+    descriptionDone = ["Compiled WebKit"]
     env = {'MFLAGS': ''}
     warningPattern = ".*arning: .*"
     haltOnFailure = False
@@ -522,6 +523,7 @@ class CompileWebKitToT(CompileWebKit):
 
 class CompileJSCOnly(CompileWebKit):
     name = "build-jsc"
+    descriptionDone = ["Compiled JSC"]
     command = ["perl", "Tools/Scripts/build-jsc", WithProperties("--%(configuration)s")]
 
 
@@ -584,14 +586,14 @@ class RunJavaScriptCoreTestsToT(RunJavaScriptCoreTests):
 class CleanBuild(shell.Compile):
     name = "delete-WebKitBuild-directory"
     description = ["deleting WebKitBuild directory"]
-    descriptionDone = ["deleted WebKitBuild directory"]
+    descriptionDone = ["Deleted WebKitBuild directory"]
     command = ["python", "Tools/BuildSlaveSupport/clean-build", WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
 
 
 class KillOldProcesses(shell.Compile):
     name = "kill-old-processes"
     description = ["killing old processes"]
-    descriptionDone = ["killed old processes"]
+    descriptionDone = ["Killed old processes"]
     command = ["python", "Tools/BuildSlaveSupport/kill-old-processes", "buildbot"]
 
     def __init__(self, **kwargs):
@@ -636,7 +638,7 @@ class ArchiveBuiltProduct(shell.ShellCommand):
                WithProperties('--platform=%(fullPlatform)s'), WithProperties('--%(configuration)s'), 'archive']
     name = 'archive-built-product'
     description = ['archiving built product']
-    descriptionDone = ['archived built product']
+    descriptionDone = ['Archived built product']
     haltOnFailure = True
 
 
@@ -660,7 +662,7 @@ class DownloadBuiltProduct(shell.ShellCommand):
         WithProperties(EWS_URL + 'archives/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(patch_id)s.zip')]
     name = 'download-built-product'
     description = ['downloading built product']
-    descriptionDone = ['downloaded built product']
+    descriptionDone = ['Downloaded built product']
     haltOnFailure = True
     flunkOnFailure = True
 
@@ -670,7 +672,7 @@ class ExtractBuiltProduct(shell.ShellCommand):
                WithProperties('--platform=%(fullPlatform)s'), WithProperties('--%(configuration)s'), 'extract']
     name = 'extract-built-product'
     description = ['extracting built product']
-    descriptionDone = ['extracted built product']
+    descriptionDone = ['Extracted built product']
     haltOnFailure = True
     flunkOnFailure = True
 
@@ -703,12 +705,13 @@ class ArchiveTestResults(shell.ShellCommand):
                Interpolate('--platform=%(prop:platform)s'), Interpolate('--%(prop:configuration)s'), 'archive']
     name = 'archive-test-results'
     description = ['archiving test results']
-    descriptionDone = ['archived test results']
+    descriptionDone = ['Archived test results']
     haltOnFailure = True
 
 
 class UploadTestResults(transfer.FileUpload):
     name = 'upload-test-results'
+    descriptionDone = ['Uploaded test results']
     workersrc = 'layout-test-results.zip'
     masterdest = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:patch_id)s-%(prop:buildnumber)s.zip')
     haltOnFailure = True
@@ -726,7 +729,7 @@ class ExtractTestResults(master.MasterShellCommand):
     zipFile = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:patch_id)s-%(prop:buildnumber)s.zip')
     resultDirectory = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:patch_id)s-%(prop:buildnumber)s')
 
-    descriptionDone = ['uploaded results']
+    descriptionDone = ['Extracted test results']
     command = ['unzip', zipFile, '-d', resultDirectory]
     renderables = ['resultDirectory']
 
index 926ce2a..b0fb079 100644 (file)
@@ -397,7 +397,7 @@ class TestKillOldProcesses(BuildStepMixinAdditions, unittest.TestCase):
                         )
             + 0,
         )
-        self.expectOutcome(result=SUCCESS, state_string='killed old processes')
+        self.expectOutcome(result=SUCCESS, state_string='Killed old processes')
         return self.runStep()
 
     def test_failure(self):
@@ -410,7 +410,7 @@ class TestKillOldProcesses(BuildStepMixinAdditions, unittest.TestCase):
             + ExpectShell.log('stdio', stdout='Unexpected error.')
             + 2,
         )
-        self.expectOutcome(result=FAILURE, state_string='killed old processes (failure)')
+        self.expectOutcome(result=FAILURE, state_string='Killed old processes (failure)')
         return self.runStep()
 
 
@@ -432,7 +432,7 @@ class TestCleanBuild(BuildStepMixinAdditions, unittest.TestCase):
                         )
             + 0,
         )
-        self.expectOutcome(result=SUCCESS, state_string='deleted WebKitBuild directory')
+        self.expectOutcome(result=SUCCESS, state_string='Deleted WebKitBuild directory')
         return self.runStep()
 
     def test_failure(self):
@@ -446,7 +446,7 @@ class TestCleanBuild(BuildStepMixinAdditions, unittest.TestCase):
             + ExpectShell.log('stdio', stdout='Unexpected error.')
             + 2,
         )
-        self.expectOutcome(result=FAILURE, state_string='deleted WebKitBuild directory (failure)')
+        self.expectOutcome(result=FAILURE, state_string='Deleted WebKitBuild directory (failure)')
         return self.runStep()
 
 
@@ -468,7 +468,7 @@ class TestCompileWebKit(BuildStepMixinAdditions, unittest.TestCase):
                         )
             + 0,
         )
-        self.expectOutcome(result=SUCCESS, state_string='compiled')
+        self.expectOutcome(result=SUCCESS, state_string='Compiled WebKit')
         return self.runStep()
 
     def test_failure(self):
@@ -482,7 +482,7 @@ class TestCompileWebKit(BuildStepMixinAdditions, unittest.TestCase):
             + ExpectShell.log('stdio', stdout='1 error generated.')
             + 2,
         )
-        self.expectOutcome(result=FAILURE, state_string='compiled (failure)')
+        self.expectOutcome(result=FAILURE, state_string='Compiled WebKit (failure)')
         return self.runStep()
 
 
@@ -505,7 +505,7 @@ class TestCompileWebKitToT(BuildStepMixinAdditions, unittest.TestCase):
                         )
             + 0,
         )
-        self.expectOutcome(result=SUCCESS, state_string='compiled')
+        self.expectOutcome(result=SUCCESS, state_string='Compiled WebKit')
         return self.runStep()
 
     def test_failure(self):
@@ -520,7 +520,7 @@ class TestCompileWebKitToT(BuildStepMixinAdditions, unittest.TestCase):
             + ExpectShell.log('stdio', stdout='1 error generated.')
             + 2,
         )
-        self.expectOutcome(result=FAILURE, state_string='compiled (failure)')
+        self.expectOutcome(result=FAILURE, state_string='Compiled WebKit (failure)')
         return self.runStep()
 
     def test_skip(self):
@@ -528,7 +528,7 @@ class TestCompileWebKitToT(BuildStepMixinAdditions, unittest.TestCase):
         self.setProperty('fullPlatform', 'ios-simulator-11')
         self.setProperty('configuration', 'release')
         self.expectHidden(True)
-        self.expectOutcome(result=SKIPPED, state_string='compiled (skipped)')
+        self.expectOutcome(result=SKIPPED, state_string='Compiled WebKit (skipped)')
         return self.runStep()
 
 
@@ -550,7 +550,7 @@ class TestCompileJSCOnly(BuildStepMixinAdditions, unittest.TestCase):
                         )
             + 0,
         )
-        self.expectOutcome(result=SUCCESS, state_string='compiled')
+        self.expectOutcome(result=SUCCESS, state_string='Compiled JSC')
         return self.runStep()
 
     def test_failure(self):
@@ -564,7 +564,7 @@ class TestCompileJSCOnly(BuildStepMixinAdditions, unittest.TestCase):
             + ExpectShell.log('stdio', stdout='1 error generated.')
             + 2,
         )
-        self.expectOutcome(result=FAILURE, state_string='compiled (failure)')
+        self.expectOutcome(result=FAILURE, state_string='Compiled JSC (failure)')
         return self.runStep()
 
 
@@ -587,7 +587,7 @@ class TestCompileJSCOnlyToT(BuildStepMixinAdditions, unittest.TestCase):
                         )
             + 0,
         )
-        self.expectOutcome(result=SUCCESS, state_string='compiled')
+        self.expectOutcome(result=SUCCESS, state_string='Compiled JSC')
         return self.runStep()
 
     def test_failure(self):
@@ -602,7 +602,7 @@ class TestCompileJSCOnlyToT(BuildStepMixinAdditions, unittest.TestCase):
             + ExpectShell.log('stdio', stdout='1 error generated.')
             + 2,
         )
-        self.expectOutcome(result=FAILURE, state_string='compiled (failure)')
+        self.expectOutcome(result=FAILURE, state_string='Compiled JSC (failure)')
         return self.runStep()
 
     def test_skip(self):
@@ -610,7 +610,7 @@ class TestCompileJSCOnlyToT(BuildStepMixinAdditions, unittest.TestCase):
         self.setProperty('fullPlatform', 'jsc-only')
         self.setProperty('configuration', 'debug')
         self.expectHidden(True)
-        self.expectOutcome(result=SKIPPED, state_string='compiled (skipped)')
+        self.expectOutcome(result=SKIPPED, state_string='Compiled JSC (skipped)')
         return self.runStep()
 
 
@@ -841,7 +841,7 @@ class TestArchiveBuiltProduct(BuildStepMixinAdditions, unittest.TestCase):
                         )
             + 0,
         )
-        self.expectOutcome(result=SUCCESS, state_string='archived built product')
+        self.expectOutcome(result=SUCCESS, state_string='Archived built product')
         return self.runStep()
 
     def test_failure(self):
@@ -855,7 +855,7 @@ class TestArchiveBuiltProduct(BuildStepMixinAdditions, unittest.TestCase):
             + ExpectShell.log('stdio', stdout='Unexpected failure.')
             + 2,
         )
-        self.expectOutcome(result=FAILURE, state_string='archived built product (failure)')
+        self.expectOutcome(result=FAILURE, state_string='Archived built product (failure)')
         return self.runStep()
 
 
@@ -907,7 +907,7 @@ class TestExtractBuiltProduct(BuildStepMixinAdditions, unittest.TestCase):
                         )
             + 0,
         )
-        self.expectOutcome(result=SUCCESS, state_string='extracted built product')
+        self.expectOutcome(result=SUCCESS, state_string='Extracted built product')
         return self.runStep()
 
     def test_failure(self):
@@ -921,7 +921,7 @@ class TestExtractBuiltProduct(BuildStepMixinAdditions, unittest.TestCase):
             + ExpectShell.log('stdio', stdout='Unexpected failure.')
             + 2,
         )
-        self.expectOutcome(result=FAILURE, state_string='extracted built product (failure)')
+        self.expectOutcome(result=FAILURE, state_string='Extracted built product (failure)')
         return self.runStep()
 
 
@@ -1149,7 +1149,7 @@ class TestArchiveTestResults(BuildStepMixinAdditions, unittest.TestCase):
                         )
             + 0,
         )
-        self.expectOutcome(result=SUCCESS, state_string='archived test results')
+        self.expectOutcome(result=SUCCESS, state_string='Archived test results')
         return self.runStep()
 
     def test_failure(self):
@@ -1164,7 +1164,7 @@ class TestArchiveTestResults(BuildStepMixinAdditions, unittest.TestCase):
             + ExpectShell.log('stdio', stdout='Unexpected failure.')
             + 2,
         )
-        self.expectOutcome(result=FAILURE, state_string='archived test results (failure)')
+        self.expectOutcome(result=FAILURE, state_string='Archived test results (failure)')
         return self.runStep()
 
 
@@ -1195,7 +1195,7 @@ class TestUploadTestResults(BuildStepMixinAdditions, unittest.TestCase):
         )
         self.expectUploadedFile('public_html/results/macOS-Sierra-Release-WK2-Tests-EWS/r1234-12.zip')
 
-        self.expectOutcome(result=SUCCESS, state_string='uploading layout-test-results.zip')
+        self.expectOutcome(result=SUCCESS, state_string='Uploaded test results')
         return self.runStep()
 
 
@@ -1221,7 +1221,7 @@ class TestExtractTestResults(BuildStepMixinAdditions, unittest.TestCase):
                                              ])
             + 0,
         )
-        self.expectOutcome(result=SUCCESS, state_string='uploaded results')
+        self.expectOutcome(result=SUCCESS, state_string='Extracted test results')
         self.expectAddedURLs([call('view layout test results', '/results/test/r2468_ab1a28b4feee0d42973c7c05335b35bca927e974 (1)/results.html')])
         return self.runStep()
 
index fa09c26..3e61d6e 100644 (file)
@@ -1,5 +1,15 @@
 2019-03-14  Aakash Jain  <aakash_jain@apple.com>
 
+        [ews-build] Make descriptionDone messages more readable
+        https://bugs.webkit.org/show_bug.cgi?id=195760
+
+        Reviewed by Lucas Forschler.
+
+        * BuildSlaveSupport/ews-build/steps.py:
+        * BuildSlaveSupport/ews-build/steps_unittest.py:
+
+2019-03-14  Aakash Jain  <aakash_jain@apple.com>
+
         [ews-build] Generate status-bubble hover-over messages
         https://bugs.webkit.org/show_bug.cgi?id=195680