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

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

Issue 2759913002: webkitpy: Small changes to merging script (Closed)
Patch Set: Reverting change to chromium.linux.json for landing. Created 3 years, 9 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
Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/merge_results_unittest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/merge_results_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/merge_results_unittest.py
index c68418bdd77b0ef9d398146324789700fdfd1077..71d814a66e68f20f2f9039fe56eb4068d9e7b588 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/merge_results_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/merge_results_unittest.py
@@ -271,14 +271,6 @@ class MergeFilesKeepFilesTests(FileSystemTestCase):
class DirMergerTests(FileSystemTestCase):
- def test_failure_on_output_existing(self):
- mock_filesystem = MockFileSystem({}, dirs=['/output'])
- d = merge_results.DirMerger(mock_filesystem)
- with self.assertRaises(OSError):
- d.merge('/output', [])
-
- self.assertDictEqual({}, mock_filesystem.files, "No new files should exist!")
-
def test_success_no_overlapping_files(self):
mock_filesystem = MockFileSystem({'/shard0/file1': '1', '/shard1/file2': '2'})
d = merge_results.DirMerger(mock_filesystem)

Powered by Google App Engine
This is Rietveld 408576698