Changeset 85524 in webkit

Timestamp:

May 2, 2011 2:43:29 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-05-02 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

cr-linux-ews should run tests
​https://bugs.webkit.org/show_bug.cgi?id=59272

This patch turns on testing for the cr-linux-ews. Yay!

• Scripts/webkitpy/tool/bot/layouttestresultsreader_unittest.py:
• Scripts/webkitpy/tool/commands/earlywarningsystem.py:
• Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
• Scripts/webkitpy/tool/steps/runtests.py:
• Scripts/webkitpy/tool/steps/steps_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/bot/layouttestresultsreader_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/earlywarningsystem.py (modified) (2 diffs)
• Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py (modified) (3 diffs)
• Scripts/webkitpy/tool/steps/runtests.py (modified) (1 diff)
• Scripts/webkitpy/tool/steps/steps_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-02  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        cr-linux-ews should run tests
+        https://bugs.webkit.org/show_bug.cgi?id=59272
+
+        This patch turns on testing for the cr-linux-ews.  Yay!
+
+        * Scripts/webkitpy/tool/bot/layouttestresultsreader_unittest.py:
+        * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
+        * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
+        * Scripts/webkitpy/tool/steps/runtests.py:
+        * Scripts/webkitpy/tool/steps/steps_unittest.py:
+
 2011-05-02  Martin Robinson  <mrobinson@igalia.com>
 

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

@@ -56 +56 @@
         results = reader.results()
         self.assertNotEquals(results, None)
-        self.assertEquals(results.failure_limit_count(), 10)  # This value matches RunTests.NON_INTERACTIVE_FAILURE_LIMIT_COUNT
+        self.assertEquals(results.failure_limit_count(), 20)  # This value matches RunTests.NON_INTERACTIVE_FAILURE_LIMIT_COUNT
 
     def test_archive_last_layout_test_results(self):

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

@@ -112 +112 @@
 # FIXME: This should merge with AbstractEarlyWarningSystem once all the EWS
 # bots run tests.
-class AbstractTestingEWS(AbstractEarlyWarningSystem):
+class AbstractTestingEWS(AbstractEarlyWarningSystem, EarlyWarningSystemTaskDelegate):
     def begin_work_queue(self):
         # FIXME: This violates abstraction
@@ -218 +218 @@
 
 
-class ChromiumLinuxEWS(AbstractChromiumEWS):
+class ChromiumLinuxEWS(AbstractTestingEWS):
     # FIXME: We should rename this command to cr-linux-ews, but that requires
     #        a database migration. :(
     name = "chromium-ews"
+    port_name = "chromium-xvfb"
+
+    # FIXME: ChromiumLinuxEWS should inherit from AbstractChromiumEWS once
+    # all the Chromium EWS bots run tests
+    watchers = AbstractChromiumEWS.watchers
 
 

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

@@ -72 +72 @@
 class EarlyWarningSytemTest(QueuesTest):
     def test_failed_builds(self):
-        ews = ChromiumLinuxEWS()
+        ews = ChromiumWindowsEWS()
         ews.bind_to_tool(MockTool())
         ews._build = lambda patch, first_run=False: False
@@ -109 +109 @@
         self.assert_queue_outputs(ews, expected_stderr=expected_stderr, expected_exceptions=expected_exceptions)
 
-    def test_testing_ews(self):
-        class ConcreteTestingEWS(AbstractTestingEWS):
-            name = "mock-testing-ews-name"
-            port_name = "mock-port"
-        ews = ConcreteTestingEWS()
-        ews.port = MockPort()
+    def _test_testing_ews(self, ews):
         expected_stderr = {
             "begin_work_queue": self._default_begin_work_queue_stderr(ews.name, MockTool().scm().checkout_root),
@@ -120 +115 @@
 """,
             "next_work_item": "",
-            "process_work_item": """MOCK: update_status: mock-testing-ews-name Pass
-MOCK: release_work_item: mock-testing-ews-name 197
-""",
+            "process_work_item": """MOCK: update_status: %s Pass
+MOCK: release_work_item: %s 197
+""" % (ews.name, ews.name),
             "handle_script_error": """ScriptError error message
 """,
         }
-        self.assert_queue_outputs(ews, expected_stderr=expected_stderr)
+        tool = MockTool()
+        tool.filesystem.write_text_file('/tmp/layout-test-results/unexpected_results.json', "")
+        self.assert_queue_outputs(ews, expected_stderr=expected_stderr, tool=tool)
 
     # FIXME: If all EWSes are going to output the same text, we
     # could test them all in one method with a for loop over an array.
     def test_chromium_linux_ews(self):
-        self._test_ews(ChromiumLinuxEWS())
+        self._test_testing_ews(ChromiumLinuxEWS())
 
     def test_chromium_windows_ews(self):

trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py

@@ -33 +33 @@
 class RunTests(AbstractStep):
     # FIXME: This knowledge really belongs in the commit-queue.
-    NON_INTERACTIVE_FAILURE_LIMIT_COUNT = 10
+    NON_INTERACTIVE_FAILURE_LIMIT_COUNT = 20
 
     @classmethod

trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py

@@ -83 +83 @@
 MOCK run_and_throw_if_fail: ['Tools/Scripts/run-javascriptcore-tests']
 Running run-webkit-tests
-MOCK run_and_throw_if_fail: ['Tools/Scripts/run-webkit-tests', '--no-new-test-results', '--no-launch-safari', '--exit-after-n-failures=10', '--quiet']
+MOCK run_and_throw_if_fail: ['Tools/Scripts/run-webkit-tests', '--no-new-test-results', '--no-launch-safari', '--exit-after-n-failures=20', '--quiet']
 """
         OutputCapture().assert_outputs(self, step.run, [{}], expected_stderr=expected_stderr)