Skip to content

Commit

Permalink
EWS pulls the wrong revision when checking out the tree for testing f…
Browse files Browse the repository at this point in the history
…or PRs

https://bugs.webkit.org/show_bug.cgi?id=248725
rdar://102964437

Reviewed by Alexey Proskuryakov and Aakash Jain.

After https://commits.webkit.org/257193@main, PRs are no longer testing against
the ews revision and are instead testing against tip-of-tree, which is incorrect.

* Tools/CISupport/ews-build/steps.py:
(CheckOutSpecificRevision.doStepIf): Do step for PRs as well as patches.
* Tools/CISupport/ews-build/steps_unittest.py:
(TestCheckOutSpecificRevision.test_skip_pr): Deleted.

Canonical link: https://commits.webkit.org/257373@main
  • Loading branch information
JonWBedard committed Dec 5, 2022
1 parent ab11627 commit 171728f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion Tools/CISupport/ews-build/steps.py
Expand Up @@ -721,7 +721,7 @@ def __init__(self, **kwargs):
super(CheckOutSpecificRevision, self).__init__(logEnviron=False, **kwargs)

def doStepIf(self, step):
return self.getProperty('ews_revision', False) and not self.getProperty('github.number', False)
return self.getProperty('ews_revision', False)

def hideStepIf(self, results, step):
return not self.doStepIf(step)
Expand Down
8 changes: 0 additions & 8 deletions Tools/CISupport/ews-build/steps_unittest.py
Expand Up @@ -3203,14 +3203,6 @@ def test_skip(self):
self.expectOutcome(result=SKIPPED, state_string='Checked out required revision (skipped)')
return self.runStep()

def test_skip_pr(self):
self.setupStep(CheckOutSpecificRevision())
self.setProperty('github.number', '1234')
self.setProperty('ews_revision', '1a3425cb92dbcbca12a10aa9514f1b77c76dc26')
self.expectHidden(True)
self.expectOutcome(result=SKIPPED, state_string='Checked out required revision (skipped)')
return self.runStep()


class TestCleanWorkingDirectory(BuildStepMixinAdditions, unittest.TestCase):
def setUp(self):
Expand Down

0 comments on commit 171728f

Please sign in to comment.