diff options
| author | ksakamoto <ksakamoto@chromium.org> | 2015-04-24 10:02:22 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-24 17:02:28 +0000 |
| commit | 42ce01867659573b37b46df12a3db18ba26674b9 (patch) | |
| tree | 2618674e9ce217ee5f47822f3907cb7fa76832f6 /tools | |
| parent | bf4296badb82df64393afcf168302c9bae736d6a (diff) | |
| download | chromium_src-42ce01867659573b37b46df12a3db18ba26674b9.zip chromium_src-42ce01867659573b37b46df12a3db18ba26674b9.tar.gz chromium_src-42ce01867659573b37b46df12a3db18ba26674b9.tar.bz2 | |
Telemetry: Re-enable ServiceWorkerPerfTest, increase timeout for VideoRecorder.IsStarted
ServiceWorkerPerfTest was failing on Android One, due to timeouts of
VideoRecorder.IsStarted(). This patch attempts to fix this by increasing
the timeout from 5 seconds to 10 seconds, and re-enable the test.
BUG=469841
TEST=tools/perf/run_benchmark --browser=trybot-all-android service_worker.service_worker
Review URL: https://codereview.chromium.org/1093923004
Cr-Commit-Position: refs/heads/master@{#326820}
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/benchmarks/service_worker.py | 2 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/core/platform/android_platform_backend.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tools/perf/benchmarks/service_worker.py b/tools/perf/benchmarks/service_worker.py index a54e6bb..8a977e2 100644 --- a/tools/perf/benchmarks/service_worker.py +++ b/tools/perf/benchmarks/service_worker.py @@ -173,8 +173,6 @@ class _ServiceWorkerMicroBenchmarkMeasurement(page_test.PageTest): browser_process, 'IOThread', filter_text , results) -# TODO(ksakamoto): Disabled due to Android One failure. crbug.com/469841 -@benchmark.Disabled('android') class ServiceWorkerPerfTest(benchmark.Benchmark): """Performance test on public applications using ServiceWorker""" test = _ServiceWorkerMeasurement diff --git a/tools/telemetry/telemetry/core/platform/android_platform_backend.py b/tools/telemetry/telemetry/core/platform/android_platform_backend.py index 3648db9..cf7b2fc 100644 --- a/tools/telemetry/telemetry/core/platform/android_platform_backend.py +++ b/tools/telemetry/telemetry/core/platform/android_platform_backend.py @@ -323,7 +323,7 @@ class AndroidPlatformBackend( self._video_recorder = screenshot.VideoRecorder( self._device, megabits_per_second=min_bitrate_mbps) self._video_recorder.Start() - util.WaitFor(self._video_recorder.IsStarted, 5) + util.WaitFor(self._video_recorder.IsStarted, 10) @property def is_video_capture_running(self): |