Modified: trunk/Tools/CISupport/ews-build/steps.py (294335 => 294336)
--- trunk/Tools/CISupport/ews-build/steps.py 2022-05-17 19:58:18 UTC (rev 294335)
+++ trunk/Tools/CISupport/ews-build/steps.py 2022-05-17 20:10:39 UTC (rev 294336)
@@ -5116,13 +5116,7 @@
return {'step': f'Failed to canonicalize {commit_pluralized}'}
return super(Canonicalize, self).getResultSummary()
- def doStepIf(self, step):
- return self.getProperty('github.number', False)
- def hideStepIf(self, results, step):
- return not self.doStepIf(step)
-
-
class PushPullRequestBranch(shell.ShellCommand):
name = 'push-pull-request-branch'
haltOnFailure = True
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (294335 => 294336)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2022-05-17 19:58:18 UTC (rev 294335)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2022-05-17 20:10:39 UTC (rev 294336)
@@ -6206,10 +6206,29 @@
def tearDown(self):
return self.tearDownBuildStep()
- def test_skipped_patch(self):
+ def test_patch(self):
self.setupStep(Canonicalize())
self.setProperty('patch_id', '1234')
- self.expectOutcome(result=SKIPPED, state_string='Canonicalize Commit (skipped)')
+
+ self.expectRemoteCommands(
+ ExpectShell(
+ workdir='wkdir',
+ timeout=300,
+ logEnviron=False,
+ command=['git', 'pull', 'origin', 'main', '--rebase'],
+ ) + 0, ExpectShell(
+ workdir='wkdir',
+ timeout=300,
+ logEnviron=False,
+ command=['git', 'checkout', 'main'],
+ ) + 0, ExpectShell(
+ workdir='wkdir',
+ timeout=300,
+ logEnviron=False,
+ command=['python3', 'Tools/Scripts/git-webkit', 'canonicalize', '-n', '1'],
+ ) + 0,
+ )
+ self.expectOutcome(result=SUCCESS, state_string='Canonicalized commit')
return self.runStep()
def test_success(self):
