diff options
| author | bajones@chromium.org <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-01 00:21:39 +0000 |
|---|---|---|
| committer | bajones@chromium.org <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-01 00:21:39 +0000 |
| commit | a2b9dacce95d1a0443a02c04e0a39185c421521e (patch) | |
| tree | 28becd8276d40b3efaea5d3c498fa24417c3ae72 /content/test/gpu | |
| parent | 8f777eee2d454e394a405d0d6f91cf91a27c85c2 (diff) | |
| download | chromium_src-a2b9dacce95d1a0443a02c04e0a39185c421521e.zip chromium_src-a2b9dacce95d1a0443a02c04e0a39185c421521e.tar.gz chromium_src-a2b9dacce95d1a0443a02c04e0a39185c421521e.tar.bz2 | |
Extended timeout for screenshot sync test
R=ccameron@chromium.org
TBR=kbr@chromium.org
BUG=256848
Review URL: https://codereview.chromium.org/131293007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/gpu')
| -rw-r--r-- | content/test/gpu/gpu_tests/screenshot_sync.py | 8 | ||||
| -rw-r--r-- | content/test/gpu/gpu_tests/screenshot_sync_expectations.py | 23 |
2 files changed, 30 insertions, 1 deletions
diff --git a/content/test/gpu/gpu_tests/screenshot_sync.py b/content/test/gpu/gpu_tests/screenshot_sync.py index b259d2b..4d38de9 100644 --- a/content/test/gpu/gpu_tests/screenshot_sync.py +++ b/content/test/gpu/gpu_tests/screenshot_sync.py @@ -3,6 +3,8 @@ # found in the LICENSE file. import os +import screenshot_sync_expectations as expectations + from telemetry import test from telemetry.core import util from telemetry.page import page_set @@ -29,6 +31,9 @@ class ScreenshotSyncProcess(test.Test): they were requested""" test = ScreenshotSyncValidator + def CreateExpectations(self, page_set): + return expectations.ScreenshotSyncExpectations() + def CreatePageSet(self, options): page_set_dict = { 'description': 'Test cases for screenshot synchronization', @@ -41,7 +46,8 @@ class ScreenshotSyncProcess(test.Test): 'navigate_steps': [ { 'action': 'navigate' }, { 'action': 'wait', - 'javascript': 'window.__testComplete' } + 'javascript': 'window.__testComplete', + 'timeout': 120 } ] } ] diff --git a/content/test/gpu/gpu_tests/screenshot_sync_expectations.py b/content/test/gpu/gpu_tests/screenshot_sync_expectations.py new file mode 100644 index 0000000..d0b634d --- /dev/null +++ b/content/test/gpu/gpu_tests/screenshot_sync_expectations.py @@ -0,0 +1,23 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +from telemetry.page import test_expectations as expectations + +# Valid expectation conditions are: +# +# Operating systems: +# win, xp, vista, win7, mac, leopard, snowleopard, lion, mountainlion, +# linux, chromeos, android +# +# GPU vendors: +# amd, arm, broadcom, hisilicon, intel, imagination, nvidia, qualcomm, +# vivante +# +# Specific GPUs can be listed as a tuple with vendor name and device ID. +# Examples: ('nvidia', 0x1234), ('arm', 'Mali-T604') +# Device IDs must be paired with a GPU vendor. + +class ScreenshotSyncExpectations(expectations.TestExpectations): + def SetExpectations(self): + pass |