Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1311)

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py

Issue 2582293004: Remove use of wdiff from layout test runner. (Closed)
Patch Set: Rebased Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/win.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
index 52ce9a621d9a4a841c752dad9814814b55514483..9062ff4de36e89067815851db569602604c1bf3c 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
@@ -973,19 +973,13 @@ class RunTest(unittest.TestCase, StreamTestingMixin):
self.assertNotIn('platform/test-win-win7/http/test.html', tests_run)
def test_output_diffs(self):
- # Test to ensure that we don't generate -wdiff.html if wdiff isn't available,
- # but we always generate -diff.txt an -pretty-diff.html.
host = MockHost()
logging_run(['--pixel-tests', 'failures/unexpected/text-image-checksum.html'], tests_included=True, host=host)
written_files = host.filesystem.written_files
- self.assertTrue(any(path.endswith('-diff.txt') for path in written_files))
- self.assertTrue(any(path.endswith('-pretty-diff.html') for path in written_files))
+ self.assertTrue(any(path.endswith('-diff.txt') for path in written_files.keys()))
+ self.assertTrue(any(path.endswith('-pretty-diff.html') for path in written_files.keys()))
self.assertFalse(any(path.endswith('-wdiff.html') for path in written_files))
- full_results_text = host.filesystem.read_text_file('/tmp/layout-test-results/full_results.json')
- full_results = json.loads(full_results_text.replace("ADD_RESULTS(", "").replace(");", ""))
- self.assertEqual(full_results['has_wdiff'], False)
-
def test_unsupported_platform(self):
stdout = StringIO.StringIO()
stderr = StringIO.StringIO()
« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/win.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698