tools/telemetry/telemetry/wait_action.py - Issue 12294002: Revert 182991

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: tools/telemetry/telemetry/wait_action.py

Issue 12294002: Revert 182991 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 years, 10 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:

OLD	NEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4 import time	4 import time

5	5

6 from telemetry import page_action	6 from telemetry import page_action

7 from telemetry import util	7 from telemetry import util

8	8

9 class WaitAction(page_action.PageAction):	9 class WaitAction(page_action.PageAction):

10 DEFAULT_TIMEOUT = 60	10 DEFAULT_TIMEOUT = 60

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
50 tab, self.text, callback_code), self.DEFAULT_TIMEOUT)	50 tab, self.text, callback_code), self.DEFAULT_TIMEOUT)

51 elif self.selector:	51 elif self.selector:

52 util.WaitFor(lambda: tab.EvaluateJavaScript(	52 util.WaitFor(lambda: tab.EvaluateJavaScript(

53 'document.querySelector("%s") != null' % self.selector),	53 'document.querySelector("%s") != null' % self.selector),

54 self.DEFAULT_TIMEOUT)	54 self.DEFAULT_TIMEOUT)

55	55

56 elif self.condition == 'javascript':	56 elif self.condition == 'javascript':

57 assert hasattr(self, 'javascript')	57 assert hasattr(self, 'javascript')

58 util.WaitFor(lambda: tab.EvaluateJavaScript(self.javascript),	58 util.WaitFor(lambda: tab.EvaluateJavaScript(self.javascript),

59 self.DEFAULT_TIMEOUT)	59 self.DEFAULT_TIMEOUT)

OLD	NEW