third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py - Issue 2014063002: Run format-webkit on webkitpy code (without string conversion).

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/controllers/single_test_runner.py

Issue 2014063002: Run format-webkit on webkitpy code (without string conversion). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased Created 4 years, 7 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/controllers/manager.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/generate_results_dashboard.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/controllers/single_test_runner.py

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

index b0e979533a178e8ac07cd80fb93c1fa0b99f9ab1..f7bbd84a861ea1dbe6c3cc30577dee9db2ae7950 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py

@@ -315,8 +315,8 @@ class SingleTestRunner(object):

def _compare_text(self, expected_text, actual_text):

failures = []

if (expected_text and actual_text and

- # Assuming expected_text is already normalized.

- self._port.do_text_results_differ(expected_text, self._get_normalized_output_text(actual_text))):

+ # Assuming expected_text is already normalized.

+ self._port.do_text_results_differ(expected_text, self._get_normalized_output_text(actual_text))):

failures.append(test_failures.FailureTextMismatch())

elif actual_text and not expected_text:

failures.append(test_failures.FailureMissingResult())

@@ -325,7 +325,7 @@ class SingleTestRunner(object):

def _compare_audio(self, expected_audio, actual_audio):

failures = []

if (expected_audio and actual_audio and

- self._port.do_audio_results_differ(expected_audio, actual_audio)):

+ self._port.do_audio_results_differ(expected_audio, actual_audio)):

failures.append(test_failures.FailureAudioMismatch())

elif actual_audio and not expected_audio:

failures.append(test_failures.FailureMissingAudio())