Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (291964 => 291965)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2022-03-28 14:22:20 UTC (rev 291964)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2022-03-28 14:51:41 UTC (rev 291965)
@@ -5012,7 +5012,7 @@
def get_patch(self, title='Patch', obsolete=0):
return json.loads('''{{"bug_id": 224460,
- "creator":"aakash_j...@apple.com",
+ "creator":"revie...@apple.com",
"data": "patch-contents",
"file_name":"bug-224460-20210412192105.patch",
"flags": [{{"creation_date" : "2021-04-12T23:21:06Z", "id": 445872, "modification_date": "2021-04-12T23:55:36Z", "name": "review", "setter": "a...@webkit.org", "status": "+", "type_id": 1}}],
@@ -5163,8 +5163,8 @@
def mock_load_contributors(*args, **kwargs):
return {
- 'aakash_j...@apple.com': {'name': 'Aakash Jain', 'status': 'reviewer'},
- 'jain-aakash': {'name': 'Aakash Jain', 'status': 'reviewer'},
+ 'revie...@apple.com': {'name': 'WebKit Reviewer', 'status': 'reviewer'},
+ 'webkit-reviewer': {'name': 'WebKit Reviewer', 'status': 'reviewer'},
'commit...@webkit.org': {'name': 'WebKit Committer', 'status': 'committer'},
'webkit-commit-queue': {'name': 'WebKit Committer', 'status': 'committer'},
}, []
@@ -5179,7 +5179,7 @@
self.setupStep(ValidateCommitterAndReviewer())
self.setProperty('patch_id', '1234')
self.setProperty('patch_committer', 'commit...@webkit.org')
- self.setProperty('reviewer', 'aakash_j...@apple.com')
+ self.setProperty('reviewer', 'revie...@apple.com')
self.expectHidden(False)
self.assertEqual(ValidateCommitterAndReviewer.haltOnFailure, False)
self.expectOutcome(result=SUCCESS, state_string='Validated commiter and reviewer')
@@ -5187,7 +5187,7 @@
def test_success_pr(self):
self.setupStep(ValidateCommitterAndReviewer())
- ValidateCommitterAndReviewer.get_reviewers = lambda x, pull_request, repository_url=None: ['jain-aakash']
+ ValidateCommitterAndReviewer.get_reviewers = lambda x, pull_request, repository_url=None: ['webkit-reviewer']
self.setProperty('github.number', '1234')
self.setProperty('owners', ['webkit-commit-queue'])
self.expectHidden(False)
@@ -5198,7 +5198,7 @@
def test_success_no_reviewer_patch(self):
self.setupStep(ValidateCommitterAndReviewer())
self.setProperty('patch_id', '1234')
- self.setProperty('patch_committer', 'aakash_j...@apple.com')
+ self.setProperty('patch_committer', 'revie...@apple.com')
self.expectHidden(False)
self.expectOutcome(result=SUCCESS, state_string='Validated committer')
return self.runStep()
@@ -5207,7 +5207,7 @@
self.setupStep(ValidateCommitterAndReviewer())
ValidateCommitterAndReviewer.get_reviewers = lambda x, pull_request, repository_url=None: []
self.setProperty('github.number', '1234')
- self.setProperty('owners', ['jain-aakash'])
+ self.setProperty('owners', ['webkit-reviewer'])
self.expectHidden(False)
self.expectOutcome(result=SUCCESS, state_string='Validated committer')
return self.runStep()
@@ -5249,7 +5249,7 @@
def test_failure_invalid_reviewer_patch(self):
self.setupStep(ValidateCommitterAndReviewer())
self.setProperty('patch_id', '1234')
- self.setProperty('patch_committer', 'aakash_j...@apple.com')
+ self.setProperty('patch_committer', 'revie...@apple.com')
self.setProperty('reviewer', 'commit...@webkit.org')
self.expectHidden(False)
self.expectOutcome(result=FAILURE, state_string='commit...@webkit.org does not have reviewer permissions')
@@ -5259,7 +5259,7 @@
self.setupStep(ValidateCommitterAndReviewer())
ValidateCommitterAndReviewer.get_reviewers = lambda x, pull_request, repository_url=None: ['webkit-commit-queue']
self.setProperty('github.number', '1234')
- self.setProperty('owners', ['jain-aakash'])
+ self.setProperty('owners', ['webkit-reviewer'])
self.expectHidden(False)
self.expectOutcome(result=FAILURE, state_string='webkit-commit-queue does not have reviewer permissions')
return self.runStep()