[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
joepeck at webkit.org
joepeck at webkit.org
Wed Dec 22 18:27:14 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3dfb63225834474c4e662e55fc79716bd245578b
Author: joepeck at webkit.org <joepeck at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Dec 11 02:08:07 2010 +0000
2010-12-10 Joseph Pecoraro <joepeck at webkit.org>
Reviewed by Darin Adler.
prepare-ChangeLog --help doesn't mention --bug shorthand -b
https://bugs.webkit.org/show_bug.cgi?id=50835
* Scripts/prepare-ChangeLog: be more explicit about -b and match file style.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73827 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9d41cf2..30681d3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -11,6 +11,29 @@
Reviewed by Adam Barth.
+ Bugs created by the commit-queue should all block on a master bug
+ https://bugs.webkit.org/show_bug.cgi?id=50857
+
+ This makes all bugs created by the commit-queue block on:
+ https://bugs.webkit.org/show_bug.cgi?id=50856
+
+ In the process of testing this, I found that the existing
+ create_bug code was wrong. I also found that existing
+ unit tests for create-rollout used invalid values
+ for options.blocks. I fixed both issues and tested.
+
+ * Scripts/webkitpy/tool/bot/flakytestreporter.py:
+ * Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py:
+ * Scripts/webkitpy/tool/commands/commandtest.py:
+ * Scripts/webkitpy/tool/commands/download_unittest.py:
+ * Scripts/webkitpy/tool/commands/upload_unittest.py:
+ * Scripts/webkitpy/tool/mocktool.py:
+ * Scripts/webkitpy/tool/steps/options.py:
+
+2010-12-10 Eric Seidel <eric at webkit.org>
+
+ Reviewed by Adam Barth.
+
Teach webkitpy how to follow duplicate chains when posting comments on flake bugs
https://bugs.webkit.org/show_bug.cgi?id=50853
diff --git a/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter.py b/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter.py
index 6dd0aab..4f7f5f3 100644
--- a/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter.py
+++ b/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter.py
@@ -88,9 +88,11 @@ The bots will update this with information from each new failure.
If you would like to track this test fix with another bug, please close this bug as a duplicate.
""" % format_values
- self._tool.bugs.create_bug(title, description,
+ master_flake_bug = 50856 # MASTER: Flaky tests found by the commit-queue
+ return self._tool.bugs.create_bug(title, description,
component="Tools / Tests",
- cc=",".join(author_emails))
+ cc=",".join(author_emails),
+ blocked="50856")
# This is over-engineered, but it makes for pretty bug messages.
def _optional_author_string(self, author_emails):
@@ -128,12 +130,13 @@ If you would like to track this test fix with another bug, please close this bug
latest_flake_message = self._latest_flake_message(flaky_test, patch)
author_emails = self._author_emails_for_test(flaky_test)
if not bug:
- self._create_bug_for_flaky_test(flaky_test, author_emails, latest_flake_message)
+ flake_bug_id = self._create_bug_for_flaky_test(flaky_test, author_emails, latest_flake_message)
else:
bug = self._follow_duplicate_chain(bug)
self._update_bug_for_flaky_test(bug, latest_flake_message)
+ flake_bug_id = bug.id()
- message += "%s bug %s%s\n" % (flaky_test, bug.id(), self._optional_author_string(author_emails))
+ message += "%s bug %s%s\n" % (flaky_test, flake_bug_id, self._optional_author_string(author_emails))
message += "The %s is continuing to process your patch." % self._bot_name
self._tool.bugs.post_comment_to_bug(patch.bug_id(), message)
diff --git a/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py b/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py
index 0b73861..637307f 100644
--- a/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py
@@ -91,4 +91,38 @@ If you would like to track this test fix with another bug, please close this bug
reporter = FlakyTestReporter(tool, 'dummy-queue')
self.assertEqual(reporter._bot_information(), "Bot Id: MockBotId Port: MockPort OS: MockPlatform 1.0")
- # report_flaky_tests is tested by queues_unittest
+ def test_create_bug_for_flaky_test(self):
+ tool = MockTool()
+ reporter = FlakyTestReporter(tool, 'dummy-queue')
+ reporter._lookup_bug_for_flaky_test = lambda bug_id: None
+ patch = tool.bugs.fetch_attachment(197)
+ expected_stderr = """MOCK create_bug
+bug_title: Flaky Test: foo/bar.html
+bug_description: This is an automatically generated bug from the dummy-queue.
+foo/bar.html has been flaky on the dummy-queue.
+
+foo/bar.html was authored by abarth at webkit.org.
+http://trac.webkit.org/browser/trunk/LayoutTests/foo/bar.html
+
+The dummy-queue just saw foo/bar.html flake while processing attachment 197 on bug 42.
+Port: MockPort OS: MockPlatform 1.0
+
+The bots will update this with information from each new failure.
+
+If you would like to track this test fix with another bug, please close this bug as a duplicate.
+
+component: Tools / Tests
+cc: abarth at webkit.org
+blocked: 50856
+MOCK bug comment: bug_id=42, cc=None
+--- Begin comment ---
+The dummy-queue encountered the following flaky tests while processing attachment 197:
+
+foo/bar.html bug None (author: abarth at webkit.org)
+The dummy-queue is continuing to process your patch.
+--- End comment ---
+
+"""
+ OutputCapture().assert_outputs(self, reporter.report_flaky_tests, [['foo/bar.html'], patch], expected_stderr=expected_stderr)
+
+ # report_flaky_tests is also tested by queues_unittest
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/commandtest.py b/WebKitTools/Scripts/webkitpy/tool/commands/commandtest.py
index adc6d81..c0efa50 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/commandtest.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/commandtest.py
@@ -33,7 +33,7 @@ from webkitpy.tool.mocktool import MockOptions, MockTool
class CommandsTest(unittest.TestCase):
def assert_execute_outputs(self, command, args, expected_stdout="", expected_stderr="", options=MockOptions(), tool=MockTool()):
- options.blocks = True
+ options.blocks = None
options.cc = 'MOCK cc'
options.component = 'MOCK component'
options.confirm = True
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/download_unittest.py b/WebKitTools/Scripts/webkitpy/tool/commands/download_unittest.py
index 9ca343b..a931134 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/download_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/download_unittest.py
@@ -169,6 +169,9 @@ MOCK create_bug
bug_title: REGRESSION(r852): Reason
bug_description: http://trac.webkit.org/changeset/852 broke the build:
Reason
+component: MOCK component
+cc: MOCK cc
+blocked: 42
Running prepare-ChangeLog
MOCK add_patch_to_bug: bug_id=None, description=ROLLOUT of r852, mark_for_review=False, mark_for_commit_queue=True, mark_for_landing=False
-- Begin comment --
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/upload_unittest.py b/WebKitTools/Scripts/webkitpy/tool/commands/upload_unittest.py
index bd1fbd6..052f4d9 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/upload_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/upload_unittest.py
@@ -79,7 +79,7 @@ MOCK: user.open_url: http://example.com/42
self.assert_execute_outputs(Prepare(), [42])
def test_prepare(self):
- expected_stderr = "MOCK create_bug\nbug_title: Mock user response\nbug_description: Mock user response\n"
+ expected_stderr = "MOCK create_bug\nbug_title: Mock user response\nbug_description: Mock user response\ncomponent: MOCK component\ncc: MOCK cc\n"
self.assert_execute_outputs(Prepare(), [], expected_stderr=expected_stderr)
def test_upload(self):
diff --git a/WebKitTools/Scripts/webkitpy/tool/mocktool.py b/WebKitTools/Scripts/webkitpy/tool/mocktool.py
index 31510c5..b398dd5 100644
--- a/WebKitTools/Scripts/webkitpy/tool/mocktool.py
+++ b/WebKitTools/Scripts/webkitpy/tool/mocktool.py
@@ -278,6 +278,12 @@ class MockBugzilla(Mock):
log("MOCK create_bug")
log("bug_title: %s" % bug_title)
log("bug_description: %s" % bug_description)
+ if component:
+ log("component: %s" % component)
+ if cc:
+ log("cc: %s" % cc)
+ if blocked:
+ log("blocked: %s" % blocked)
def quips(self):
return ["Good artists copy. Great artists steal. - Pablo Picasso"]
diff --git a/WebKitTools/Scripts/webkitpy/tool/steps/options.py b/WebKitTools/Scripts/webkitpy/tool/steps/options.py
index 4f17dd3..5b8baf0 100644
--- a/WebKitTools/Scripts/webkitpy/tool/steps/options.py
+++ b/WebKitTools/Scripts/webkitpy/tool/steps/options.py
@@ -29,7 +29,7 @@
from optparse import make_option
class Options(object):
- blocks = make_option("--blocks", action="store", dest="blocks", default=None, help="Bug number which the created bug blocks.")
+ blocks = make_option("--blocks", action="store", type="string", dest="blocks", default=None, help="Bug number which the created bug blocks.")
build = make_option("--build", action="store_true", dest="build", default=False, help="Build and run run-webkit-tests before committing.")
build_style = make_option("--build-style", action="store", dest="build_style", default=None, help="Whether to build debug, release, or both.")
cc = make_option("--cc", action="store", type="string", dest="cc", help="Comma-separated list of email addresses to carbon-copy.")
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list