Changeset 74373 in webkit

Timestamp:

Dec 20, 2010 3:55:36 PM (13 years ago)

Author:

eric@webkit.org

Message:

2010-12-20 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

commit-queue should include bot id when attaching failure diffs
​https://bugs.webkit.org/show_bug.cgi?id=51280

This is a tiny change to include the bot id in the name of the attachment.
Most of this diff is just changing the unit test expectations
now that I hid the comment printing when the comment is None.

• Scripts/webkitpy/tool/bot/flakytestreporter.py:
• Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py:
• Scripts/webkitpy/tool/commands/upload_unittest.py:
• Scripts/webkitpy/tool/mocktool.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/bot/flakytestreporter.py (modified) (1 diff)
• Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py (modified) (3 diffs)
• Scripts/webkitpy/tool/commands/upload_unittest.py (modified) (4 diffs)
• Scripts/webkitpy/tool/mocktool.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2010-12-20  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        commit-queue should include bot id when attaching failure diffs
+        https://bugs.webkit.org/show_bug.cgi?id=51280
+
+        This is a tiny change to include the bot id in the name of the attachment.
+        Most of this diff is just changing the unit test expectations
+        now that I hid the comment printing when the comment is None.
+
+        * Scripts/webkitpy/tool/bot/flakytestreporter.py:
+        * Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py:
+        * Scripts/webkitpy/tool/commands/upload_unittest.py:
+        * Scripts/webkitpy/tool/mocktool.py:
+
 2010-12-20  Jeff Miller  <jeffm@apple.com>
 

trunk/Tools/Scripts/webkitpy/tool/bot/flakytestreporter.py

@@ -172 +172 @@
             if self._tool.filesystem.exists(results_diff_path):
                 results_diff = self._tool.filesystem.read_binary_file(results_diff_path)
-                self._tool.bugs.add_attachment_to_bug(flake_bug_id, results_diff, "Failure diff from bot", filename="failure.diff")
+                bot_id = self._tool.status_server.bot_id or "bot"
+                self._tool.bugs.add_attachment_to_bug(flake_bug_id, results_diff, "Failure diff from %s" % bot_id, filename="failure.diff")
             else:
                 _log.error("%s does not exist as expected, not uploading." % results_diff_path)

trunk/Tools/Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py

@@ -98 +98 @@
     def test_report_flaky_tests_creating_bug(self):
         tool = MockTool()
-        tool.filesystem = MockFileSystem({"/mock/foo/bar.diff": "mock"})
+        tool.filesystem = MockFileSystem({"/mock/foo/bar-diffs.txt": "mock"})
+        tool.status_server = MockStatusServer(bot_id="mock-bot-id")
         reporter = FlakyTestReporter(tool, 'dummy-queue')
         reporter._lookup_bug_for_flaky_test = lambda bug_id: None
@@ -111 +112 @@
 
 The dummy-queue just saw foo/bar.html flake while processing attachment 197 on bug 42.
-Port: MockPort  Platform: MockPlatform 1.0
+Bot: mock-bot-id  Port: MockPort  Platform: MockPlatform 1.0
 
 The bots will update this with information from each new failure.
@@ -120 +121 @@
 cc: abarth@webkit.org
 blocked: 50856
+MOCK add_attachment_to_bug: bug_id=78, description=Failure diff from mock-bot-id filename=failure.diff
 MOCK bug comment: bug_id=42, cc=None
 --- Begin comment ---

trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py

@@ -64 +64 @@
 Obsoleting 2 old patches on bug 42
 MOCK add_patch_to_bug: bug_id=42, description=MOCK description, mark_for_review=True, mark_for_commit_queue=False, mark_for_landing=False
--- Begin comment --
-None
--- End comment --
 MOCK: user.open_url: http://example.com/42
 """
@@ -73 +70 @@
 
     def test_land_safely(self):
-        expected_stderr = "Obsoleting 2 old patches on bug 42\nMOCK add_patch_to_bug: bug_id=42, description=Patch for landing, mark_for_review=False, mark_for_commit_queue=False, mark_for_landing=True\n-- Begin comment --\nNone\n-- End comment --\n"
+        expected_stderr = "Obsoleting 2 old patches on bug 42\nMOCK add_patch_to_bug: bug_id=42, description=Patch for landing, mark_for_review=False, mark_for_commit_queue=False, mark_for_landing=True\n"
         self.assert_execute_outputs(LandSafely(), [42], expected_stderr=expected_stderr)
 
@@ -96 +93 @@
 Obsoleting 2 old patches on bug 42
 MOCK add_patch_to_bug: bug_id=42, description=MOCK description, mark_for_review=True, mark_for_commit_queue=False, mark_for_landing=False
--- Begin comment --
-None
--- End comment --
 MOCK: user.open_url: http://example.com/42
 """
@@ -110 +104 @@
         options.bug_id = 42
         options.comment = "MOCK comment"
-        expected_stderr = "Bug: <http://example.com/42> Bug with two r+'d and cq+'d patches, one of which has an invalid commit-queue setter.\nRevision: 9876\nMOCK: user.open_url: http://example.com/42\nAdding comment to Bug 42.\nMOCK bug comment: bug_id=42, cc=None\n--- Begin comment ---\nMOCK comment\n\nCommitted r9876: <http://trac.webkit.org/changeset/9876>\n--- End comment ---\n\n"
+        expected_stderr = """Bug: <http://example.com/42> Bug with two r+'d and cq+'d patches, one of which has an invalid commit-queue setter.
+Revision: 9876
+MOCK: user.open_url: http://example.com/42
+Adding comment to Bug 42.
+MOCK bug comment: bug_id=42, cc=None
+--- Begin comment ---
+MOCK comment
+
+Committed r9876: <http://trac.webkit.org/changeset/9876>
+--- End comment ---
+
+"""
         expected_stdout = "Is this correct?\n"
         self.assert_execute_outputs(MarkBugFixed(), [], expected_stdout=expected_stdout, expected_stderr=expected_stderr, tool=tool, options=options)

trunk/Tools/Scripts/webkitpy/tool/mocktool.py

@@ -343 +343 @@
             bug_id, cc, comment_text))
 
+    def add_attachment_to_bug(self,
+                              bug_id,
+                              file_or_string,
+                              description,
+                              filename=None,
+                              comment_text=None):
+        log("MOCK add_attachment_to_bug: bug_id=%s, description=%s filename=%s" % (bug_id, description, filename))
+        if comment_text:
+            log("-- Begin comment --")
+            log(comment_text)
+            log("-- End comment --")
+
     def add_patch_to_bug(self,
                          bug_id,
@@ -353 +365 @@
         log("MOCK add_patch_to_bug: bug_id=%s, description=%s, mark_for_review=%s, mark_for_commit_queue=%s, mark_for_landing=%s" %
             (bug_id, description, mark_for_review, mark_for_commit_queue, mark_for_landing))
-        log("-- Begin comment --")
-        log(comment_text)
-        log("-- End comment --")
+        if comment_text:
+            log("-- Begin comment --")
+            log(comment_text)
+            log("-- End comment --")