Skip to content
Permalink
Browse files
[webkitpy] Avoid multiple "Preparing rollout for bug" log messages
https://bugs.webkit.org/show_bug.cgi?id=131106

Patch by Eva Balazsfalvi <evab.u-szeged@partner.samsung.com> on 2014-04-02
Reviewed by Csaba Osztrogonác.

* Scripts/webkitpy/tool/commands/download.py:
(AbstractRolloutPrepCommand._prepare_state):
* Scripts/webkitpy/tool/commands/download_unittest.py:
(test_prepare_rollout):
(test_create_rollout):
(test_create_rollout_resolved):
(test_rollout):

Canonical link: https://commits.webkit.org/149150@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@166646 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Eva Balazsfalvi authored and webkit-commit-queue committed Apr 2, 2014
1 parent f9c375f commit 112ec22149e2bf029e9713d64be340bc7488a076
Showing 3 changed files with 30 additions and 20 deletions.
@@ -1,3 +1,18 @@
2014-04-02 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>

[webkitpy] Avoid multiple "Preparing rollout for bug" log messages
https://bugs.webkit.org/show_bug.cgi?id=131106

Reviewed by Csaba Osztrogonác.

* Scripts/webkitpy/tool/commands/download.py:
(AbstractRolloutPrepCommand._prepare_state):
* Scripts/webkitpy/tool/commands/download_unittest.py:
(test_prepare_rollout):
(test_create_rollout):
(test_create_rollout_resolved):
(test_rollout):

2014-04-02 Krzysztof Wolanski <k.wolanski@samsung.com>

[EFL] Add option to use separate web process for new window in MiniBrowser
@@ -403,15 +403,6 @@ def _prepare_state(self, options, args, tool):
raise ScriptError(message="Invalid svn revision number: " + revision)
revision_list.sort()

# We use the earliest revision for the bug info
for revision in revision_list:
commit_info = self._commit_info(revision)
if commit_info:
description_list.append(commit_info.bug_description())
bug_id_list.append(commit_info.bug_id())
else:
description_list.append(None)
bug_id_list.append(None)
earliest_revision = revision_list[0]
state = {
"revision": earliest_revision,
@@ -421,14 +412,22 @@ def _prepare_state(self, options, args, tool):
"bug_id_list": bug_id_list,
"description_list": description_list,
}
commit_info = self._commit_info(earliest_revision)
if commit_info:
state["bug_blocked"] = commit_info.bug_id()
cc_list = sorted([party.bugzilla_email()
for revision in revision_list:
commit_info = self._commit_info(revision)
if commit_info:
# We use the earliest revision for the bug info
if revision == earliest_revision:
state["bug_blocked"] = commit_info.bug_id()
cc_list = sorted([party.bugzilla_email()
for party in commit_info.responsible_parties()
if party.bugzilla_email()])
# FIXME: We should used the list as the canonical representation.
state["bug_cc"] = ",".join(cc_list)
# FIXME: We should used the list as the canonical representation.
state["bug_cc"] = ",".join(cc_list)
description_list.append(commit_info.bug_description())
bug_id_list.append(commit_info.bug_id())
else:
description_list.append(None)
bug_id_list.append(None)
return state


@@ -289,12 +289,11 @@ def test_land_from_url(self):
self.assert_execute_outputs(LandFromURL(), ["https://bugs.webkit.org/show_bug.cgi?id=50000"], options=self._default_options(), expected_logs=expected_logs)

def test_prepare_rollout(self):
expected_logs = "Preparing rollout for bug 50000.\nPreparing rollout for bug 50000.\nUpdating working directory\n"
expected_logs = "Preparing rollout for bug 50000.\nUpdating working directory\n"
self.assert_execute_outputs(PrepareRollout(), [852, "Reason"], options=self._default_options(), expected_logs=expected_logs)

def test_create_rollout(self):
expected_logs = """Preparing rollout for bug 50000.
Preparing rollout for bug 50000.
Updating working directory
MOCK create_bug
bug_title: REGRESSION(r852): Reason
@@ -320,7 +319,6 @@ def test_create_rollout_multiple_revision(self):
expected_logs = """Preparing rollout for bug 50000.
Preparing rollout for bug 50000.
Unable to parse bug number from diff.
Preparing rollout for bug 50000.
Updating working directory
MOCK create_bug
bug_title: REGRESSION(r852): Reason
@@ -345,7 +343,6 @@ def test_create_rollout_multiple_revision(self):

def test_create_rollout_resolved(self):
expected_logs = """Preparing rollout for bug 50004.
Preparing rollout for bug 50004.
Updating working directory
MOCK create_bug
bug_title: REGRESSION(r3001): Reason
@@ -370,7 +367,6 @@ def test_create_rollout_resolved(self):

def test_rollout(self):
expected_logs = """Preparing rollout for bug 50000.
Preparing rollout for bug 50000.
Updating working directory
MOCK: user.open_url: file://...
Was that diff correct?

0 comments on commit 112ec22

Please sign in to comment.