Title: [129465] trunk/Tools
- Revision
- 129465
- Author
- [email protected]
- Date
- 2012-09-25 00:53:45 -0700 (Tue, 25 Sep 2012)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (129464 => 129465)
--- trunk/Tools/ChangeLog 2012-09-25 07:33:33 UTC (rev 129464)
+++ trunk/Tools/ChangeLog 2012-09-25 07:53:45 UTC (rev 129465)
@@ -1,3 +1,12 @@
+2012-09-25 Zan Dobersek <[email protected]>
+
+ 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 <[email protected]>
Unexpected reftest passes are only reported when pixel testing is enabled in results.html as well
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (129464 => 129465)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-09-25 07:33:33 UTC (rev 129464)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-09-25 07:53:45 UTC (rev 129465)
@@ -964,11 +964,11 @@
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):
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
