summaryrefslogtreecommitdiffstats
path: root/chrome/test/chromeos/autotest
diff options
context:
space:
mode:
authordennisjeffrey@chromium.org <dennisjeffrey@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-16 01:16:49 +0000
committerdennisjeffrey@chromium.org <dennisjeffrey@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-16 01:16:49 +0000
commitcae0e51976085db08f0f52266a864bfa439fe802 (patch)
tree58e58f332023f5bca721fe74fa93c14dc23caa35 /chrome/test/chromeos/autotest
parent87c4be491af2f2a4ff2f4e213186883b3655cde4 (diff)
downloadchromium_src-cae0e51976085db08f0f52266a864bfa439fe802.zip
chromium_src-cae0e51976085db08f0f52266a864bfa439fe802.tar.gz
chromium_src-cae0e51976085db08f0f52266a864bfa439fe802.tar.bz2
Pyauto tests in perf.py now tolerate a threshold number of automation timeouts before failing.
Previously, when an automation call to AppendTab() timed out, it would cause the executing test to fail. Given that these automation calls occasionally time out on ChromeOS (reason currently unknown), the tests are now modified to tolerate a threshold number of timeouts (whose timing measurements are ignored) before failing the test. This will allow more good performance data to be recorded and graphed. BUG=chromium-os:18185 TEST=None Review URL: http://codereview.chromium.org/7904029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/chromeos/autotest')
-rw-r--r--chrome/test/chromeos/autotest/files/client/site_tests/desktopui_PyAutoPerfTests/desktopui_PyAutoPerfTests.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_PyAutoPerfTests/desktopui_PyAutoPerfTests.py b/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_PyAutoPerfTests/desktopui_PyAutoPerfTests.py
index 4d9e9fb..1207722 100644
--- a/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_PyAutoPerfTests/desktopui_PyAutoPerfTests.py
+++ b/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_PyAutoPerfTests/desktopui_PyAutoPerfTests.py
@@ -71,6 +71,11 @@ class desktopui_PyAutoPerfTests(chrome_test.ChromeTestBase):
default=0,
help='Number of iterations for perf measurements. '
'Defaults to the value given in perf.py.')
+ parser.add_option('--max-timeouts', dest='max_timeouts', type='int',
+ default=0,
+ help='Maximum number of automation timeouts to '
+ 'ignore before failing the test. Defaults to '
+ 'the value given in perf.py.')
# Preprocess the args to remove quotes before/after each one if they
# exist. This is necessary because arguments passed via
# run_remote_tests.sh may be individually quoted, and those quotes must
@@ -100,6 +105,8 @@ class desktopui_PyAutoPerfTests(chrome_test.ChromeTestBase):
environment = os.environ.copy()
if options.num_iterations:
environment['NUM_ITERATIONS'] = str(options.num_iterations)
+ if options.max_timeouts:
+ environment['MAX_TIMEOUT_COUNT'] = str(options.max_timeouts)
proc = subprocess.Popen(
functional_cmd, shell=True, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, env=environment)