third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py - Issue 2580293002: Style change: Rename error variables "e" -> "error"

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/port/android.py

Issue 2580293002: Style change: Rename error variables "e" -> "error" (Closed)

Patch Set: Rebase and fix formatter unittest. Created 4 years 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/lint_test_expectations.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.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/port/android.py

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

index bc33ead3014fca5e31d9fdb03e8d050b30da7b4d..dde644ed291422c4fbb3ca5aa34498fee9e2e9fd 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py

@@ -361,9 +361,9 @@ class AndroidPort(base.Port):

try:

d._setup_test(log_safely)

log_safely("device prepared", throttled=False)

- except (ScriptError, driver.DeviceFailure) as e:

+ except (ScriptError, driver.DeviceFailure) as error:

with lock:

- _log.warning("[%s] failed to prepare_device: %s", serial, str(e))

+ _log.warning("[%s] failed to prepare_device: %s", serial, error)

except KeyboardInterrupt:

if pool:

pool.terminate()

@@ -912,8 +912,8 @@ class ChromiumAndroidDriver(driver.Driver):

try:

if self._start_once(pixel_tests, per_test_args):

return

- except ScriptError as e:

- self._abort('ScriptError("%s") in _start()' % str(e))

+ except ScriptError as error:

+ self._abort('ScriptError("%s") in _start()' % error)

self._log_error('Failed to start the content_shell application. Retries=%d. Log:%s' % (retries, self._get_logcat()))

self.stop()