third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/merge_results.py - Issue 2759913002: webkitpy: Small changes to merging script

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/merge_results.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

« testing/buildbot/chromium.fyi.json ('K') | « third_party/WebKit/Tools/Scripts/merge-layout-test-results ('k') | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/merge_results_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/merge_results.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/merge_results.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/merge_results.py

index 442beec09516abe332d8941f293749acf2ca422e..cbfcae51dabdb5674ec2f278d9e01308c25fa3a0 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/merge_results.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/merge_results.py

@@ -430,8 +430,6 @@ class DirMerger(Merger):

def merge(self, output_dir, to_merge_dirs):

output_dir = self.filesystem.realpath(self.filesystem.abspath(output_dir))

- if self.filesystem.exists(output_dir):

- raise OSError("Output directory %s exists." % output_dir)

merge_dirs = []

# Normalize the given directory values.

@@ -466,8 +464,8 @@ class DirMerger(Merger):

for partial_file_path, in_dirs in sorted(files.iteritems()):

out_path = self.filesystem.join(output_dir, partial_file_path)

if self.filesystem.exists(out_path):

- raise MergeFailure('File %s already exist in output.' % (

- out_path))

+ raise MergeFailure(

+ 'File %s already exist in output.', out_path, None, None)

dirname = self.filesystem.dirname(out_path)

if not self.filesystem.exists(dirname):