| 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)
|
|
|