Changeset 122151 in webkit

Timestamp:

Jul 9, 2012 1:10:31 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r122124.
​http://trac.webkit.org/changeset/122124
​https://bugs.webkit.org/show_bug.cgi?id=90815

It broke NRWT on Qt (Requested by Ossy_HOME on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-07-09

• Scripts/webkitpy/layout_tests/port/qt.py:

(QtPort._skipped_file_search_paths):

• Scripts/webkitpy/layout_tests/port/qt_unittest.py:

(QtPortTest._assert_skipped_path):
(QtPortTest.test_skipped_file_search_path):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/qt.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/qt_unittest.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-07-09  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r122124.
+        http://trac.webkit.org/changeset/122124
+        https://bugs.webkit.org/show_bug.cgi?id=90815
+
+        It broke NRWT on Qt (Requested by Ossy_HOME on #webkit).
+
+        * Scripts/webkitpy/layout_tests/port/qt.py:
+        (QtPort._skipped_file_search_paths):
+        * Scripts/webkitpy/layout_tests/port/qt_unittest.py:
+        (QtPortTest._assert_skipped_path):
+        (QtPortTest.test_skipped_file_search_path):
+
 2012-07-09  Zan Dobersek  <zandobersek@gmail.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py

@@ -141 +141 @@
         return skipped_path
 
-    def expectations_files(self):
-        # expectations_files() uses the directories listed in _search_paths reversed.
-        # e.g. qt -> qt-linux -> qt-4.8
-        return list(reversed([self._filesystem.join(self._webkit_baseline_path(p), 'TestExpectations') for p in self._search_paths()]))
-
     def setup_environ_for_server(self, server_name=None):
         clean_env = WebKitPort.setup_environ_for_server(self, server_name)

trunk/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py

@@ -29 +29 @@
 import unittest
 import os
-from copy import deepcopy
 
 from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2
@@ -80 +79 @@
         self.assertEquals(port._skipped_file_search_paths(), search_paths)
 
-    def _assert_expectations_files(self, search_paths, os_name, use_webkit2=False, qt_version='4.8'):
-        # FIXME: Port constructors should not "parse" the port name, but
-        # rather be passed components (directly or via setters).  Once
-        # we fix that, this method will need a re-write.
-        host = MockSystemHost(os_name=os_name)
-        host.executive = MockExecutive2(self._qt_version(qt_version))
-        port_name = 'qt-' + os_name
-        port = self.make_port(host=host, qt_version=qt_version, port_name=port_name,
-                              options=MockOptions(webkit_test_runner=use_webkit2, platform='qt'))
-        self.assertEquals(port.expectations_files(), search_paths)
-
     def _qt_version(self, qt_version):
         if qt_version in '4.8':
@@ -107 +95 @@
                 case['search_paths'].append("wk2")
             self._assert_skipped_path(**case)
-
-    def test_expectations_files(self):
-        for case in self.search_paths_cases:
-            expectations_case = deepcopy(case)
-            expectations_case['search_paths'] = []
-            for path in reversed(case['search_paths']):
-                expectations_case['search_paths'].append('/mock-checkout/LayoutTests/platform/%s/TestExpectations' % (path))
-            self._assert_expectations_files(**expectations_case)
 
     def test_show_results_html_file(self):