Changeset 272785 in webkit

Timestamp:

Feb 12, 2021, 10:06:05 AM (4 years ago)

Author:

aakash_jain@apple.com

Message:

[build.webkit.org] commit identifier should show main instead of trunk
​https://bugs.webkit.org/show_bug.cgi?id=221798

Reviewed by Jonathan Bedard.

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

(ShowIdentifier.init): Increased timeout to 10 minutes (since first run might take a while).
(ShowIdentifier.evaluateCommand):

• CISupport/build-webkit-org/steps_unittest.py: Updated unit-tests.

Location:

trunk/Tools

Files:

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

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

@@ -1135 +1135 @@
 
     def __init__(self, **kwargs):
-        shell.ShellCommand.__init__(self, timeout=2 * 60, logEnviron=False, **kwargs)
+        shell.ShellCommand.__init__(self, timeout=10 * 60, logEnviron=False, **kwargs)
 
     def start(self):
@@ -1153 +1153 @@
         if match:
             identifier = match.group(1)
+            if identifier:
+                identifier = identifier.replace('trunk', 'main')
             self.setProperty('identifier', identifier)
             step = self.getLastBuildStepByName(CheckOutSource.name)

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

@@ -512 +512 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
-                        timeout=120,
+                        timeout=600,
                         logEnviron=False,
                         command=['python', 'Tools/Scripts/git-webkit', 'find', 'r272692']) +
-            ExpectShell.log('stdio', stdout='Identifier: 233939@trunk') +
+            ExpectShell.log('stdio', stdout='Identifier: 233939@main') +
             0,
         )
-        self.expectOutcome(result=SUCCESS, state_string='Identifier: 233939@trunk')
+        self.expectOutcome(result=SUCCESS, state_string='Identifier: 233939@main')
         rc = self.runStep()
-        self.assertEqual(self.getProperty('identifier'), '233939@trunk')
+        self.assertEqual(self.getProperty('identifier'), '233939@main')
         return rc
 
@@ -528 +528 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
-                        timeout=120,
+                        timeout=600,
                         logEnviron=False,
                         command=['python', 'Tools/Scripts/git-webkit', 'find', 'r272692']) +

trunk/Tools/ChangeLog

@@ +1 @@
+2021-02-12  Aakash Jain  <aakash_jain@apple.com>
+
+        [build.webkit.org] commit identifier should show main instead of trunk
+        https://bugs.webkit.org/show_bug.cgi?id=221798
+
+        Reviewed by Jonathan Bedard.
+
+        * CISupport/build-webkit-org/steps.py:
+        (ShowIdentifier.__init__): Increased timeout to 10 minutes (since first run might take a while).
+        (ShowIdentifier.evaluateCommand):
+        * CISupport/build-webkit-org/steps_unittest.py: Updated unit-tests.
+
 2021-02-12  Jonathan Bedard  <jbedard@apple.com>