REGRESSION(r121497): It switched off and broke many unittests

https://bugs.webkit.org/show_bug.cgi?id=90371

Patch by Csaba Osztrogonác <ossy@webkit.org> on 2012-07-02
Reviewed by Adam Barth.

* Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py:
(ChromiumMacPortTest): Use snowleopard as os_version instead of leopard, because it isn't supported anymore.
* Scripts/webkitpy/layout_tests/port/chromium_port_testcase.py:
(ChromiumPortTestCase.test_all_test_configurations): Remove leopard testcases, because it isn't supported anymore.
* Scripts/webkitpy/layout_tests/port/port_testcase.py:
(PortTestCase): Inherit class PortTestCase from unittest.TestCase instead of object.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121701 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 106fcb6..1b7c9d0 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2012-07-02  Csaba Osztrogonác  <ossy@webkit.org>
+
+        REGRESSION(r121497): It switched off and broke many unittests
+        https://bugs.webkit.org/show_bug.cgi?id=90371
+
+        Reviewed by Adam Barth.
+
+        * Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py:
+        (ChromiumMacPortTest): Use snowleopard as os_version instead of leopard, because it isn't supported anymore.
+        * Scripts/webkitpy/layout_tests/port/chromium_port_testcase.py:
+        (ChromiumPortTestCase.test_all_test_configurations): Remove leopard testcases, because it isn't supported anymore.
+        * Scripts/webkitpy/layout_tests/port/port_testcase.py:
+        (PortTestCase): Inherit class PortTestCase from unittest.TestCase instead of object.
+
 2012-07-02  Ojan Vafai  <ojan@chromium.org>
 
         Move rebaseline-all command from the gardening-server down into webkit-patch

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py
index a572e5d..87904a8 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py
@@ -35,7 +35,7 @@ from webkitpy.tool.mocktool import MockOptions
 
 class ChromiumMacPortTest(chromium_port_testcase.ChromiumPortTestCase):
     os_name = 'mac'
-    os_version = 'leopard'
+    os_version = 'snowleopard'
     port_name = 'chromium-mac'
     port_maker = chromium_mac.ChromiumMacPort
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_port_testcase.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_port_testcase.py
index 8b5b02a..da6e40f 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_port_testcase.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_port_testcase.py
@@ -64,8 +64,6 @@ class ChromiumPortTestCase(port_testcase.PortTestCase):
         self.assertEquals(set(port.all_test_configurations()), set([
             TestConfiguration('icecreamsandwich', 'x86', 'debug'),
             TestConfiguration('icecreamsandwich', 'x86', 'release'),
-            TestConfiguration('leopard', 'x86', 'debug'),
-            TestConfiguration('leopard', 'x86', 'release'),
             TestConfiguration('snowleopard', 'x86', 'debug'),
             TestConfiguration('snowleopard', 'x86', 'release'),
             TestConfiguration('lion', 'x86', 'debug'),

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py b/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
index 4c3e6b1..9f77832 100755 (executable)
--- a/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
@@ -44,7 +44,7 @@ from webkitpy.layout_tests.port.config_mock import MockConfig
 from webkitpy.tool.mocktool import MockOptions
 
 
-class PortTestCase(object):
+class PortTestCase(unittest.TestCase):
     """Tests that all Port implementations must pass."""
     HTTP_PORTS = (8000, 8080, 8443)
     WEBSOCKET_PORTS = (8880,)