Unreviewed, adjusting the test cases after r129459. The JSON data
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 25 Sep 2012 07:53:45 +0000 (07:53 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 25 Sep 2012 07:53:45 +0000 (07:53 +0000)
for reftests now contains the 'reftest_type' key and no more 'is_reftest'
or 'is_mismatch_reftest' keys.

* Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
(EndToEndTest.test_reftest_with_two_notrefs):

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

Tools/ChangeLog
Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py

index bb79b13..32eedc9 100644 (file)
@@ -1,3 +1,12 @@
+2012-09-25  Zan Dobersek  <zandobersek@gmail.com>
+
+        Unreviewed, adjusting the test cases after r129459. The JSON data
+        for reftests now contains the 'reftest_type' key and no more 'is_reftest'
+        or 'is_mismatch_reftest' keys.
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+        (EndToEndTest.test_reftest_with_two_notrefs):
+
 2012-09-24  Zan Dobersek  <zandobersek@gmail.com>
 
         Unexpected reftest passes are only reported when pixel testing is enabled in results.html as well
index d10360e..4afcc14 100755 (executable)
@@ -964,11 +964,11 @@ class EndToEndTest(unittest.TestCase):
         self.assertTrue("multiple-mismatch-success.html" not in json["tests"]["reftests"]["foo"])
         self.assertTrue("multiple-both-success.html" not in json["tests"]["reftests"]["foo"])
         self.assertEqual(json["tests"]["reftests"]["foo"]["multiple-match-failure.html"],
-            {"expected": "PASS", "actual": "IMAGE", "image_diff_percent": 1, 'is_reftest': True})
+            {"expected": "PASS", "actual": "IMAGE", "reftest_type": ["=="], "image_diff_percent": 1})
         self.assertEqual(json["tests"]["reftests"]["foo"]["multiple-mismatch-failure.html"],
-            {"expected": "PASS", "actual": "IMAGE", "is_mismatch_reftest": True})
+            {"expected": "PASS", "actual": "IMAGE", "reftest_type": ["!="]})
         self.assertEqual(json["tests"]["reftests"]["foo"]["multiple-both-failure.html"],
-            {"expected": "PASS", "actual": "IMAGE", "is_mismatch_reftest": True, "is_reftest": True})
+            {"expected": "PASS", "actual": "IMAGE", "reftest_type": ["==", "!="]})
 
 
 class RebaselineTest(unittest.TestCase, StreamTestingMixin):