2011-02-20 Dirk Pranke <dpranke@chromium.org>

        Reviewed by Ojan Vafai.

        test-webkitpy: stop skipping a bunch of tests on win32
        https://bugs.webkit.org/show_bug.cgi?id=54788

        * Scripts/webkitpy/common/net/testoutputset_unittest.py:
        * Scripts/webkitpy/test/main.py:

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 766c7a4692fe3c862f6ebc43ceea0da953e7784c..07734d26012fe873b332d50cb081fdedf97af989 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-20  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        test-webkitpy: stop skipping a bunch of tests on win32
+        https://bugs.webkit.org/show_bug.cgi?id=54788
+
+        * Scripts/webkitpy/common/net/testoutputset_unittest.py:
+        * Scripts/webkitpy/test/main.py:
+
 2011-02-20  Dirk Pranke  <dpranke@chromium.org>
 
         Reviewed by Ojan Vafai.

diff --git a/Tools/Scripts/webkitpy/common/net/testoutputset_unittest.py b/Tools/Scripts/webkitpy/common/net/testoutputset_unittest.py
index a70a539e88a300875eec6da566d7f7c4f05aba86..f33850c84367651697199d68cd5869cac2575ac4 100644 (file)
--- a/Tools/Scripts/webkitpy/common/net/testoutputset_unittest.py
+++ b/Tools/Scripts/webkitpy/common/net/testoutputset_unittest.py
@@ -22,6 +22,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import sys
+
 from webkitpy.common.system.zip_mock import MockZip
 import testoutputset
 import unittest
@@ -72,6 +74,11 @@ class TestOutputSetTest(unittest.TestCase):
         self.assertEquals(2, len(b.outputs_for('fast/dom/test')))
 
     def test_can_infer_platform_from_path_if_none_provided(self):
+        # FIXME: unclear what the right behavior on win32 is.
+        # https://bugs.webkit.org/show_bug.cgi?id=54525.
+        if sys.platform == 'win32':
+            return
+
         zip = MockZip()
         zip.insert('platform/win/some-test-expected.png', '<image data>')
         zip.insert('platform/win/some-test-expected.checksum', 'abc123')

diff --git a/Tools/Scripts/webkitpy/test/main.py b/Tools/Scripts/webkitpy/test/main.py
index 94db6f5d3073db465a12bca943283b0f765c7694..080e0e5ed1e15b9521ccd604baa7d5a5ce545a00 100644 (file)
--- a/Tools/Scripts/webkitpy/test/main.py
+++ b/Tools/Scripts/webkitpy/test/main.py
@@ -83,26 +83,14 @@ class Tester(object):
         # FIXME: Remove this once https://bugs.webkit.org/show_bug.cgi?id=54526 is resolved.
         if any([module_path.startswith(package) for package in [
             'webkitpy.tool',
-            'webkitpy.style',
-            'webkitpy.common.net',
             'webkitpy.common.checkout',
             'webkitpy.common.config',
             ]]):
             return False
 
         return module_path not in [
-            # FIXME: Remove this when https://bugs.webkit.org/show_bug.cgi?id=54525 is resolved.
-            'webkitpy.common.net.testoutputset_unittest',
-
             # FIXME: This file also requires common.checkout to work
             'webkitpy.layout_tests.deduplicate_tests_unittest',
-
-            'webkitpy.common.prettypatch_unittest',
-            'webkitpy.layout_tests.update_webgl_conformance_tests_unittest',
-            'webkitpy.layout_tests.port.mac_unittest',
-            'webkitpy.layout_tests.port.chromium_unittest',
-            'webkitpy.layout_tests.port.mock_drt_unittest',
-            'webkitpy.layout_tests.port.config_unittest',
         ]
 
     def run_tests(self, sys_argv, external_package_paths=None):