chrome/test/pyautolib/pyauto.py - Issue 10828335: [pyauto] Fix ActionTimeoutChanger

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: chrome/test/pyautolib/pyauto.py

Issue 10828335: [pyauto] Fix ActionTimeoutChanger (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 years, 4 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:

Index: chrome/test/pyautolib/pyauto.py

diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py

index 1d7b46ffe97f2c97178dd8d71a725c14c8dc7815..0c4d37df1d2a6b0d932b072f31a42c9d4137dbdf 100755

--- a/chrome/test/pyautolib/pyauto.py

+++ b/chrome/test/pyautolib/pyauto.py

@@ -1059,7 +1059,7 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):

pyauto_errors.JSONInterfaceError if the automation call returns an error.

"""

if timeout == -1: # Default

- timeout = self.action_max_timeout_ms()

+ timeout = self.action_timeout_ms()

if windex is None: # Do not target any window

windex = -1

result = self._SendJSONRequest(windex, json.dumps(cmd_dict), timeout)

« no previous file with comments | « chrome/test/functional/test_pyauto.py ('k') | no next file » | no next file with comments »