Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 24 insertions, 23 deletions

diff --git a/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py b/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py
index b33129a20..78dae3ba9 100644
--- a/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py
@@ -47,44 +47,45 @@ class AbstractEarlyWarningSystemTest(QueuesTest):
         ews._expected_failures.unexpected_failures_observed = lambda results: set(["foo.html", "bar.html"])
         task = Mock()
         patch = ews._tool.bugs.fetch_attachment(10000)
-        self.assertEqual(ews._failing_tests_message(task, patch), "New failing tests:\nbar.html\nfoo.html")
+        self.assertMultiLineEqual(ews._failing_tests_message(task, patch), "New failing tests:\nbar.html\nfoo.html")
 
 
-class EarlyWarningSytemTest(QueuesTest):
+class EarlyWarningSystemTest(QueuesTest):
     def _default_expected_logs(self, ews):
-        string_replacemnts = {
+        string_replacements = {
             "name": ews.name,
             "port": ews.port_name,
         }
+        if ews.run_tests:
+            run_tests_line = "Running: webkit-patch --status-host=example.com build-and-test --no-clean --no-update --test --non-interactive --port=%(port)s\n" % string_replacements
+        else:
+            run_tests_line = ""
+        string_replacements['run_tests_line'] = run_tests_line
+
         expected_logs = {
             "begin_work_queue": self._default_begin_work_queue_logs(ews.name),
-            "process_work_item": "MOCK: update_status: %(name)s Pass\nMOCK: release_work_item: %(name)s 10000\n" % string_replacemnts,
+            "process_work_item": """Running: webkit-patch --status-host=example.com clean --port=%(port)s
+Running: webkit-patch --status-host=example.com update --port=%(port)s
+Running: webkit-patch --status-host=example.com apply-attachment --no-update --non-interactive 10000 --port=%(port)s
+Running: webkit-patch --status-host=example.com build --no-clean --no-update --build-style=release --port=%(port)s
+%(run_tests_line)sMOCK: update_status: %(name)s Pass
+MOCK: release_work_item: %(name)s 10000
+""" % string_replacements,
             "handle_unexpected_error": "Mock error message\n",
             "handle_script_error": "ScriptError error message\n\nMOCK output\n",
         }
         return expected_logs
 
-    def _test_builder_ews(self, ews):
+    def _test_ews(self, ews):
         ews.bind_to_tool(MockTool())
         options = Mock()
         options.port = None
-        options.run_tests = ews._default_run_tests
+        options.run_tests = ews.run_tests
         self.assert_queue_outputs(ews, expected_logs=self._default_expected_logs(ews), options=options)
 
-    def _test_testing_ews(self, ews):
-        ews.test_results = lambda: None
-        ews.bind_to_tool(MockTool())
-        expected_logs = self._default_expected_logs(ews)
-        self.assert_queue_outputs(ews, expected_logs=expected_logs)
-
-    def test_builder_ewses(self):
-        self._test_builder_ews(MacEWS())
-        self._test_builder_ews(ChromiumWindowsEWS())
-        self._test_builder_ews(ChromiumAndroidEWS())
-        self._test_builder_ews(QtEWS())
-        self._test_builder_ews(QtWK2EWS())
-        self._test_builder_ews(GtkEWS())
-        self._test_builder_ews(EflEWS())
-
-    def test_testing_ewses(self):
-        self._test_testing_ews(ChromiumLinuxEWS())
+    def test_ewses(self):
+        classes = AbstractEarlyWarningSystem.load_ews_classes()
+        self.assertTrue(classes)
+        self.maxDiff = None
+        for ews_class in classes:
+            self._test_ews(ews_class())