Skip to content

Commit

Permalink
Merged PRs still frequently show zero commits
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=245281
<rdar://100034493>

Reviewed by Ryan Haddad.

* Tools/CISupport/ews-build/steps.py:
(PushCommitToWebKitRepo.evaluateCommand): Remove ClosePullRequest.
(ClosePullRequest): Deleted.
* Tools/CISupport/ews-build/steps_unittest.py:

Canonical link: https://commits.webkit.org/254566@main
  • Loading branch information
JonWBedard committed Sep 16, 2022
1 parent 2f0cbc3 commit c5ed986
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 57 deletions.
29 changes: 1 addition & 28 deletions Tools/CISupport/ews-build/steps.py
Expand Up @@ -1940,33 +1940,6 @@ def hideStepIf(self, results, step):
return not self.doStepIf(step)


class ClosePullRequest(buildstep.BuildStep, GitHubMixin, AddToLogMixin):
name = 'close-pull-request'
flunkOnFailure = False
haltOnFailure = False

def start(self):
self.pr_number = self.getProperty('github.number', '')
if self.close_pr(self.pr_number, self.getProperty('repository')):
self.finished(SUCCESS)
else:
self.finished(FAILURE)
return None

def getResultSummary(self):
if self.results == FAILURE:
return {'step': f'Failed to close PR {self.pr_number}'}
if self.results == SUCCESS:
return {'step': f'Closed PR {self.pr_number}'}
return buildstep.BuildStep.getResultSummary(self)

def doStepIf(self, step):
return self.getProperty('github.number')

def hideStepIf(self, results, step):
return not self.doStepIf(step)


class LeaveComment(buildstep.BuildStep, BugzillaMixin, GitHubMixin):
name = 'leave-comment'
flunkOnFailure = False
Expand Down Expand Up @@ -4599,7 +4572,7 @@ def evaluateCommand(self, cmd):
DetermineLandedIdentifier(),
LeaveComment(),
RemoveFlagsOnPatch(), RemoveLabelsFromPullRequest(),
CloseBug(), ClosePullRequest(),
CloseBug(),
]
self.build.addStepsAfterCurrentStep(steps_to_add)

Expand Down
30 changes: 1 addition & 29 deletions Tools/CISupport/ews-build/steps_unittest.py
Expand Up @@ -45,7 +45,7 @@
from steps import (AddReviewerToCommitMessage, AnalyzeAPITestsResults, AnalyzeCompileWebKitResults,
AnalyzeJSCTestsResults, AnalyzeLayoutTestsResults, ApplyPatch, ApplyWatchList, ArchiveBuiltProduct, ArchiveTestResults, BugzillaMixin,
Canonicalize, CheckOutPullRequest, CheckOutSource, CheckOutSpecificRevision, CheckChangeRelevance, CheckStatusOnEWSQueues, CheckStyle,
CleanBuild, CleanUpGitIndexLock, CleanGitRepo, CleanWorkingDirectory, ClosePullRequest, CompileJSC, CommitPatch, CompileJSCWithoutChange,
CleanBuild, CleanUpGitIndexLock, CleanGitRepo, CleanWorkingDirectory, CompileJSC, CommitPatch, CompileJSCWithoutChange,
CompileWebKit, CompileWebKitWithoutChange, ConfigureBuild, ConfigureBuild, Contributors,
DetermineLandedIdentifier, DownloadBuiltProduct, DownloadBuiltProductFromMaster, EWS_BUILD_HOSTNAME, ExtractBuiltProduct, ExtractTestResults,
FetchBranches, FindModifiedLayoutTests, GitHub,
Expand Down Expand Up @@ -6652,33 +6652,5 @@ def update_pr(x, pr_number, title, description, base=None, head=None, repository
return rc


class TestClosePullRequest(BuildStepMixinAdditions, unittest.TestCase):
def setUp(self):
self.longMessage = True
return self.setUpBuildStep()

def tearDown(self):
return self.tearDownBuildStep()

def test_success(self):
ClosePullRequest.close_pr = lambda x, pr_number, repository_url=None: True
self.setupStep(ClosePullRequest())
self.setProperty('github.number', '1234')
self.expectOutcome(result=SUCCESS, state_string='Closed PR 1234')
return self.runStep()

def test_failure(self):
ClosePullRequest.close_pr = lambda x, pr_number, repository_url=None: False
self.setupStep(ClosePullRequest())
self.setProperty('github.number', '1234')
self.expectOutcome(result=FAILURE, state_string='Failed to close PR 1234')
return self.runStep()

def test_skip(self):
self.setupStep(ClosePullRequest())
self.expectOutcome(result=SKIPPED, state_string='finished (skipped)')
return self.runStep()


if __name__ == '__main__':
unittest.main()

0 comments on commit c5ed986

Please sign in to comment.