def test_flag_permission_rejection_message(self):
validator = CommitterValidator(bugzilla=None)
expected_messsage="""[email protected] does not have review permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/committers.py.
- If you do not have review rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags.
- If you have review rights please correct the error in WebKitTools/Scripts/webkitpy/committers.py by adding yourself to the file (no review needed). Due to bug 30084 the commit-queue will require a restart after your change. Please contact [email protected] to request a commit-queue restart. After restart the commit-queue will correctly respect your review rights."""
self.assertEqual(validator._flag_permission_rejection_message("*****@*****.**", "review"), expected_messsage)
def test_flag_permission_rejection_message(self):
validator = CommitterValidator(bugzilla=None)
expected_messsage = """[email protected] does not have review permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/committers.py.
- If you do not have review rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags.
- If you have review rights please correct the error in WebKitTools/Scripts/webkitpy/committers.py by adding yourself to the file (no review needed). Due to bug 30084 the commit-queue will require a restart after your change. Please contact [email protected] to request a commit-queue restart. After restart the commit-queue will correctly respect your review rights."""
self.assertEqual(
validator._flag_permission_rejection_message(
"*****@*****.**", "review"), expected_messsage)
class CommitQueue(AbstractQueue, StepSequenceErrorHandler):
name = "commit-queue"
def __init__(self):
AbstractQueue.__init__(self)
# AbstractQueue methods
def begin_work_queue(self):
AbstractQueue.begin_work_queue(self)
self.committer_validator = CommitterValidator(self.tool.bugs)
def _validate_patches_in_commit_queue(self):
# Not using BugzillaQueries.fetch_patches_from_commit_queue() so we can reject patches with invalid committers/reviewers.
bug_ids = self.tool.bugs.queries.fetch_bug_ids_from_commit_queue()
all_patches = sum([self.tool.bugs.fetch_bug(bug_id).commit_queued_patches(include_invalid=True) for bug_id in bug_ids], [])
return self.committer_validator.patches_after_rejecting_invalid_commiters_and_reviewers(all_patches)
def next_work_item(self):
patches = self._validate_patches_in_commit_queue()
# FIXME: We could sort the patches in a specific order here, was suggested by https://bugs.webkit.org/show_bug.cgi?id=33395
if not patches:
self._update_status("Empty queue")
return None
# Only bother logging if we have patches in the queue.
self.log_progress([patch.id() for patch in patches])
return patches[0]
def _can_build_and_test(self):
try:
self.run_webkit_patch(["build-and-test", "--force-clean", "--non-interactive", "--build-style=both", "--quiet"])
except ScriptError, e:
self._update_status("Unabled to successfully build and test", None)
return False
return True
class CommitQueue(AbstractQueue, StepSequenceErrorHandler):
name = "commit-queue"
def __init__(self):
AbstractQueue.__init__(self)
# AbstractQueue methods
def begin_work_queue(self):
AbstractQueue.begin_work_queue(self)
self.committer_validator = CommitterValidator(self.tool.bugs)
def _validate_patches_in_commit_queue(self):
# Not using BugzillaQueries.fetch_patches_from_commit_queue() so we can reject patches with invalid committers/reviewers.
bug_ids = self.tool.bugs.queries.fetch_bug_ids_from_commit_queue()
all_patches = sum([self.tool.bugs.fetch_bug(bug_id).commit_queued_patches(include_invalid=True) for bug_id in bug_ids], [])
return self.committer_validator.patches_after_rejecting_invalid_commiters_and_reviewers(all_patches)
def next_work_item(self):
patches = self._validate_patches_in_commit_queue()
# FIXME: We could sort the patches in a specific order here, was suggested by https://bugs.webkit.org/show_bug.cgi?id=33395
if not patches:
self._update_status("Empty queue")
return None
# Only bother logging if we have patches in the queue.
self.log_progress([patch.id() for patch in patches])
return patches[0]
def _can_build_and_test(self):
try:
self.run_webkit_patch(["build-and-test", "--force-clean", "--non-interactive", "--build-style=both", "--quiet"])
except ScriptError, e:
self._update_status("Unabled to successfully build and test", None)
return False
return True
def handle_script_error(cls, tool, state, script_error):
status_id = cls._update_status_for_script_error(tool, state, script_error)
validator = CommitterValidator(tool.bugs)
validator.reject_patch_from_commit_queue(state["patch"].id(), cls._error_message_for_bug(tool, status_id, script_error))
def begin_work_queue(self):
AbstractQueue.begin_work_queue(self)
self.committer_validator = CommitterValidator(self.tool.bugs)
def handle_script_error(cls, tool, state, script_error):
status_id = cls._update_status_for_script_error(tool, state, script_error)
validator = CommitterValidator(tool.bugs)
validator.reject_patch_from_commit_queue(state["patch"].id(), cls._error_message_for_bug(tool, status_id, script_error))
def begin_work_queue(self):
AbstractPatchQueue.begin_work_queue(self)
self.committer_validator = CommitterValidator(self.tool.bugs)