Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(634)

Side by Side Diff: chrome/test/functional/test_utils.py

Issue 6685099: Removing command_execution_timeout_ms in favor of action_max_timeout_ms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 #!/usr/bin/python 1 #!/usr/bin/python
2 2
3 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 import copy 7 import copy
8 import email 8 import email
9 import logging 9 import logging
10 import os 10 import os
11 import smtplib 11 import smtplib
12 import types 12 import types
13 13
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 210
211 Args: 211 Args:
212 content_string: string to search for within content 212 content_string: string to search for within content
213 have_list: list of strings found within content 213 have_list: list of strings found within content
214 nothave_list: list of strings not found within content 214 nothave_list: list of strings not found within content
215 """ 215 """
216 for s in have_list: 216 for s in have_list:
217 test.assertTrue(s in content_string, s) 217 test.assertTrue(s in content_string, s)
218 for s in nothave_list: 218 for s in nothave_list:
219 test.assertTrue(s not in content_string) 219 test.assertTrue(s not in content_string)
220
221
222 def CallFunctionWithNewTimeout(self, new_timeout, function):
Nirnimesh 2011/03/29 20:27:28 Please let this be. And fix CmdExecutionTimeoutCha
Huyen 2011/03/31 02:42:55 Done. I also changed CmdExecutionTimeoutChanger to
223 """Sets the timeout to |new_timeout| and calls |function|.
224
225 This method resets the timeout before returning.
226 """
227 timeout_changer = pyauto.PyUITest.CmdExecutionTimeoutChanger(
228 self, new_timeout)
229 logging.info('Automation execution timeout has been changed to %d. '
230 'If the timeout is large the test might appear to hang.'
231 % new_timeout)
232 function()
233 del timeout_changer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698