Skip to content

Commit

Permalink
Regression 264089@main: [ews] unapply-patch is consistently failing w…
Browse files Browse the repository at this point in the history
…ith an exception

https://bugs.webkit.org/show_bug.cgi?id=259935
rdar://113591649

Reviewed by Aakash Jain.

* Tools/CISupport/ews-build/steps.py:
(CleanWorkingDirectory.run): setCommand deprecated in new-style builds.
* Tools/CISupport/ews-build/steps_unittest.py:
(TestCleanWorkingDirectory.test_success_wpe):

Canonical link: https://commits.webkit.org/266721@main
  • Loading branch information
JonWBedard authored and aj062 committed Aug 9, 2023
1 parent 4861f4a commit acd9454
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Tools/CISupport/ews-build/steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,7 @@ def __init__(self, **kwargs):
def run(self):
platform = self.getProperty('platform')
if platform in ('gtk', 'wpe'):
self.setCommand(self.command + ['--keep-jhbuild-directory'])
self.command = self.command + ['--keep-jhbuild-directory']
return super().run()


Expand Down
13 changes: 13 additions & 0 deletions Tools/CISupport/ews-build/steps_unittest.py
Original file line number Diff line number Diff line change
Expand Up @@ -3466,6 +3466,19 @@ def test_success(self):
self.expectOutcome(result=SUCCESS, state_string='Cleaned working directory')
return self.runStep()

def test_success_wpe(self):
self.setupStep(CleanWorkingDirectory())
self.setProperty('platform', 'wpe')
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
command=['python3', 'Tools/Scripts/clean-webkit', '--keep-jhbuild-directory'],
)
+ 0,
)
self.expectOutcome(result=SUCCESS, state_string='Cleaned working directory')
return self.runStep()

def test_failure(self):
self.setupStep(CleanWorkingDirectory())
self.expectRemoteCommands(
Expand Down

0 comments on commit acd9454

Please sign in to comment.