summaryrefslogtreecommitdiffstats
path: root/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-06-02 12:07:03 +0100
committerBen Murdoch <benm@google.com>2011-06-10 10:47:21 +0100
commit2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch)
treee4964fbd1cb70599f7718ff03e50ea1dab33890b /Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py
parent87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff)
downloadexternal_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip
external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz
external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py')
-rw-r--r--Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py26
1 files changed, 23 insertions, 3 deletions
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py b/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py
index 4586a23..8906154 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py
@@ -84,10 +84,22 @@ svg/batik/text/smallFonts.svg
os_version_string=os_version_string)
self.assertEquals(expected, port.name())
+ def test_tests_for_other_platforms(self):
+ port = mac.MacPort(port_name='mac-snowleopard')
+ dirs_to_skip = port._tests_for_other_platforms()
+ self.assertTrue('platform/chromium-linux' in dirs_to_skip)
+ self.assertTrue('platform/mac-tiger' in dirs_to_skip)
+ self.assertFalse('platform/mac' in dirs_to_skip)
+ self.assertFalse('platform/mac-snowleopard' in dirs_to_skip)
+
+ def test_version(self):
+ port = mac.MacPort()
+ self.assertTrue(port.version())
+
def test_versions(self):
port = self.make_port()
if port:
- self.assertTrue(port.name() in ('mac-tiger', 'mac-leopard', 'mac-snowleopard'))
+ self.assertTrue(port.name() in ('mac-tiger', 'mac-leopard', 'mac-snowleopard', 'mac-future'))
self.assert_name(None, '10.4.8', 'mac-tiger')
self.assert_name('mac', '10.4.8', 'mac-tiger')
@@ -107,8 +119,16 @@ svg/batik/text/smallFonts.svg
self.assert_name('mac-snowleopard', '10.5.3', 'mac-snowleopard')
self.assert_name('mac-snowleopard', '10.6.3', 'mac-snowleopard')
- self.assertRaises(KeyError, self.assert_name, None, '10.7.1', 'mac-leopard')
- self.assertRaises(KeyError, self.assert_name, None, '10.3.1', 'mac-leopard')
+ self.assert_name(None, '10.7', 'mac-future')
+ self.assert_name(None, '10.7.3', 'mac-future')
+ self.assert_name(None, '10.8', 'mac-future')
+ self.assert_name('mac', '10.7.3', 'mac-future')
+ self.assert_name('mac-future', '10.4.3', 'mac-future')
+ self.assert_name('mac-future', '10.5.3', 'mac-future')
+ self.assert_name('mac-future', '10.6.3', 'mac-future')
+ self.assert_name('mac-future', '10.7.3', 'mac-future')
+
+ self.assertRaises(AssertionError, self.assert_name, None, '10.3.1', 'should-raise-assertion-so-this-value-does-not-matter')
if __name__ == '__main__':