Changeset 73798 in webkit

Timestamp:

Dec 10, 2010 1:42:04 PM (13 years ago)

Author:

eric@webkit.org

Message:

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

Reviewed by Tony Chang.

commit-queue should report port/platform information when commenting on flaky test bugs
​https://bugs.webkit.org/show_bug.cgi?id=50839

This was a suggestion from Tony Chang this morning.
I added a platform.py class so I could easily mock the platform call,
but that may not be the final solution for this mocking.
We'll try it and see.

• Scripts/webkitpy/common/system/platform.py: Added.
• Scripts/webkitpy/tool/bot/flakytestreporter.py:
• Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py:
• Scripts/webkitpy/tool/commands/queues_unittest.py:
• Scripts/webkitpy/tool/main.py:
• Scripts/webkitpy/tool/mocktool.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/platform.py (added)
• Scripts/webkitpy/tool/bot/flakytestreporter.py (modified) (2 diffs)
• Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/tool/commands/queues_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/tool/main.py (modified) (3 diffs)
• Scripts/webkitpy/tool/mocktool.py (modified) (4 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-12-10  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Tony Chang.
+
+        commit-queue should report port/platform information when commenting on flaky test bugs
+        https://bugs.webkit.org/show_bug.cgi?id=50839
+
+        This was a suggestion from Tony Chang this morning.
+        I added a platform.py class so I could easily mock the platform call,
+        but that may not be the final solution for this mocking.
+        We'll try it and see.
+
+        * Scripts/webkitpy/common/system/platform.py: Added.
+        * Scripts/webkitpy/tool/bot/flakytestreporter.py:
+        * Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py:
+        * Scripts/webkitpy/tool/commands/queues_unittest.py:
+        * Scripts/webkitpy/tool/main.py:
+        * Scripts/webkitpy/tool/mocktool.py:
+
 2010-12-10  Krithigassree Sambamurthy  <krithigassree.sambamurthy@nokia.com>
 

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

@@ -28 +28 @@
 
 import logging
+import platform
 
 from webkitpy.common.net.layouttestresults import path_for_layout_test, LayoutTestResults
@@ -97 +98 @@
         return " (%s: %s)" % (heading_string, authors_string)
 
+    def _bot_information(self):
+        bot_id = self._tool.status_server.bot_id
+        bot_id_string = "Bot Id: %s " % (bot_id) if bot_id else ""
+        return "%sPort: %s OS: %s" % (bot_id_string, self._tool.port().name(), self._tool.platform.display_name())
+
+    def _latest_flake_message(self, flaky_test, patch):
+        flake_message = "The %s just saw %s flake while processing attachment %s on bug %s." % (self._bot_name, flaky_test, patch.id(), patch.bug_id())
+        return "%s\n%s" % (flake_message, self._bot_information())
+
     def report_flaky_tests(self, flaky_tests, patch):
         message = "The %s encountered the following flaky tests while processing attachment %s:\n\n" % (self._bot_name, patch.id())
         for flaky_test in flaky_tests:
             bug = self._lookup_bug_for_flaky_test(flaky_test)
-            latest_flake_message = "The %s just saw %s flake while processing attachment %s on bug %s." % (self._bot_name, flaky_test, patch.id(), patch.bug_id())
+            latest_flake_message = self._latest_flake_message(flaky_test, patch)
             author_emails = self._author_emails_for_test(flaky_test)
             if not bug:

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

@@ -32 +32 @@
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.tool.bot.flakytestreporter import FlakyTestReporter
-from webkitpy.tool.mocktool import MockTool
+from webkitpy.tool.mocktool import MockTool, MockStatusServer
 
 
@@ -80 +80 @@
         OutputCapture().assert_outputs(self, reporter._create_bug_for_flaky_test, ['foo/bar.html', ['test@test.com'], 'FLAKE_MESSAGE'], expected_stderr=expected_stderr)
 
+    def test_bot_information(self):
+        tool = MockTool()
+        tool.status_server = MockStatusServer("MockBotId")
+        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

trunk/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py

@@ -328 +328 @@
 --- Begin comment ---
 The commit-queue just saw foo/bar.html flake while processing attachment 197 on bug 42.
+Port: MockPort OS: MockPlatform 1.0
 --- End comment ---
 
@@ -333 +334 @@
 --- Begin comment ---
 The commit-queue just saw bar/baz.html flake while processing attachment 197 on bug 42.
+Port: MockPort OS: MockPlatform 1.0
 --- End comment ---
 

trunk/WebKitTools/Scripts/webkitpy/tool/main.py

@@ -42 +42 @@
 from webkitpy.common.net.statusserver import StatusServer
 from webkitpy.common.system.executive import Executive
+from webkitpy.common.system.platform import Platform
 from webkitpy.common.system.user import User
 from webkitpy.layout_tests import port
@@ -63 +64 @@
         self._path = path
         self.wakeup_event = threading.Event()
+        # FIXME: All of these shared objects should move off onto a
+        # separate "Tool" object.  WebKitPatch should inherit from
+        # "Tool" and all these objects should use getters/setters instead of
+        # manual getter functions (e.g. scm()).
         self.bugs = Bugzilla()
         self.buildbot = BuildBot()
@@ -73 +78 @@
         self.status_server = StatusServer()
         self.port_factory = port.factory
+        self.platform = Platform()
 
     def scm(self):

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

@@ -614 +614 @@
 
 
+class MockPort(Mock):
+    def name(self):
+        return "MockPort"
+
 class MockTestPort1(object):
 
@@ -630 +634 @@
     def get_all(self, options=None):
         return {"test_port1": MockTestPort1(), "test_port2": MockTestPort2()}
+
+
+class MockPlatform(object):
+    def display_name(self):
+        return "MockPlatform 1.0"
 
 
@@ -646 +655 @@
         self.irc_password = "MOCK irc password"
         self.port_factory = MockPortFactory()
+        self.platform = MockPlatform()
 
     def scm(self):
@@ -664 +674 @@
 
     def port(self):
-        return Mock()
+        return MockPort()