From 3749d61e1f7a59f5ec5067e560af1eb610c82015 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Sun, 12 Aug 2012 09:27:39 +0200 Subject: Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365) New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream --- Tools/Scripts/webkitpy/layout_tests/port/image_diff_unittest.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Tools/Scripts/webkitpy/layout_tests/port/image_diff_unittest.py') diff --git a/Tools/Scripts/webkitpy/layout_tests/port/image_diff_unittest.py b/Tools/Scripts/webkitpy/layout_tests/port/image_diff_unittest.py index b06756c35..46cc98a11 100755 --- a/Tools/Scripts/webkitpy/layout_tests/port/image_diff_unittest.py +++ b/Tools/Scripts/webkitpy/layout_tests/port/image_diff_unittest.py @@ -46,7 +46,12 @@ class FakePort(object): class TestImageDiffer(unittest.TestCase): - def test_diff_image(self): + def test_diff_image_failed(self): port = FakePort(['diff: 100% failed\n']) image_differ = ImageDiffer(port) - self.assertEquals(image_differ.diff_image('foo', 'bar', 0.1), ('', 100.0)) + self.assertEquals(image_differ.diff_image('foo', 'bar', 0.1), ('', 100.0, None)) + + def test_diff_image_passed(self): + port = FakePort(['diff: 0% passed\n']) + image_differ = ImageDiffer(port) + self.assertEquals(image_differ.diff_image('foo', 'bar', 0.1), (None, 0, None)) -- cgit v1.2.1