summaryrefslogtreecommitdiffstats
path: root/tools/perf/benchmarks/media.py
diff options
context:
space:
mode:
authortonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-26 03:19:26 +0000
committertonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-26 03:19:26 +0000
commit0456ee71c846f6390a2af85fe4ff80c647a28086 (patch)
tree86eab92441bee52826e5930d005dbd273714b90d /tools/perf/benchmarks/media.py
parent57d83182d3280f27f57daa5c1778f1fdf1fbfaee (diff)
downloadchromium_src-0456ee71c846f6390a2af85fe4ff80c647a28086.zip
chromium_src-0456ee71c846f6390a2af85fe4ff80c647a28086.tar.gz
chromium_src-0456ee71c846f6390a2af85fe4ff80c647a28086.tar.bz2
Revert 247106 "Enable media android tests and make --disable-ges..."
Fails on Nexus 4 and Nexus 7v2. http://build.chromium.org/p/chromium.perf/builders/Android%20Nexus4%20Perf/builds/123/steps/media.android/logs/stdio http://build.chromium.org/p/chromium.perf/builders/Android%20Nexus7v2%20Perf/builds/124/steps/media.android/logs/stdio TimeoutException: Timed out while waiting 60s for util.WaitFor(lambda: self.HasEventCompletedOrError(tab, selector, event_name), timeout=timeout). > Enable media android tests and make --disable-gesture-requirement-for-media-playback default for media measurement. > > Issues with nexus 4 and 7 are not repro-ing. Plus with earlier changes to media actions, > tests should skip when video error happens instead of marking the bot red. > > BUG=329691 > > Review URL: https://codereview.chromium.org/145033014 TBR=shadi@chromium.org Review URL: https://codereview.chromium.org/144973005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247157 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/perf/benchmarks/media.py')
-rw-r--r--tools/perf/benchmarks/media.py19
1 files changed, 19 insertions, 0 deletions
diff --git a/tools/perf/benchmarks/media.py b/tools/perf/benchmarks/media.py
index f0a65f0..8367dc6 100644
--- a/tools/perf/benchmarks/media.py
+++ b/tools/perf/benchmarks/media.py
@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import sys
+
from telemetry import test
from telemetry.page import page_measurement
@@ -35,12 +37,21 @@ class MediaAndroid(test.Test):
"""Obtains media metrics for key user scenarios on Android."""
test = media.Media
tag = 'android'
+ # Disable media-tests on Android: crbug/329691
+ # Before re-enabling on Android, make sure the new 4K content,
+ # garden2_10s*, passes.
+ enabled = not sys.platform.startswith('linux')
page_set = 'page_sets/tough_video_cases.json'
# Exclude crowd* media files (50fps 2160p).
options = {
'page_filter_exclude': '.*crowd.*'
}
+ def CustomizeBrowserOptions(self, options):
+ # Needed to run media actions in JS in Android.
+ options.AppendExtraBrowserArgs(
+ '--disable-gesture-requirement-for-media-playback')
+
class MediaChromeOS(test.Test):
"""Obtains media metrics for key user scenarios on ChromeOS."""
test = media.Media
@@ -51,8 +62,16 @@ class MediaChromeOS(test.Test):
'page_filter_exclude': '.*crowd.*'
}
+ def CustomizeBrowserOptions(self, options):
+ # Needed to run media actions in JS in Android.
+ options.AppendExtraBrowserArgs(
+ '--disable-gesture-requirement-for-media-playback')
+
class MediaSourceExtensions(test.Test):
"""Obtains media metrics for key media source extensions functions."""
+ test = media.Media
+ # Disable MSE media-tests on Android and linux: crbug/329691
+ # Disable MSE tests on windows 8 crbug.com/330910
test = MSEMeasurement
page_set = 'page_sets/mse_cases.json'