diff options
author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-08 10:53:21 +0000 |
---|---|---|
committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-08 10:53:21 +0000 |
commit | 38c524b9d727b5cb9289f2c37869c002833ac14c (patch) | |
tree | b47985cf082067f77cede0d75d7b94af8fb8d12b /tools/telemetry | |
parent | 3d2a4dfaf95d2544320956f09ee5848a92d75fe4 (diff) | |
download | chromium_src-38c524b9d727b5cb9289f2c37869c002833ac14c.zip chromium_src-38c524b9d727b5cb9289f2c37869c002833ac14c.tar.gz chromium_src-38c524b9d727b5cb9289f2c37869c002833ac14c.tar.bz2 |
Telemetry: start the activity in order to initialize the prefs file.
When running on a fresh install, there's no preferences available.
Rather than throwing an exception, start the browser and wait for the file to become available.
BUG=166176
TEST=tools/perf/run_multipage_benchmarks --browser=android-chrome --show-stdout sunspider tools/perf/page_sets/sunspider.json -vvv
Review URL: https://chromiumcodereview.appspot.com/11574039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175515 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/telemetry')
-rw-r--r-- | tools/telemetry/telemetry/android_browser_backend.py | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/tools/telemetry/telemetry/android_browser_backend.py b/tools/telemetry/telemetry/android_browser_backend.py index 07c26ca..1d1e0c4 100644 --- a/tools/telemetry/telemetry/android_browser_backend.py +++ b/tools/telemetry/telemetry/android_browser_backend.py @@ -1,12 +1,14 @@ # Copyright (c) 2012 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. + import json import logging import os import subprocess import sys import tempfile +import time from telemetry import adb_commands from telemetry import browser_backend @@ -72,11 +74,23 @@ class AndroidBrowserBackend(browser_backend.BrowserBackend): prefs_file = (app_data_dir + '/app_chrome/Default/Preferences') if not self._adb.FileExistsOnDevice(prefs_file): - logging.critical( - 'android_browser_backend: Could not find preferences file ' + - '%s for %s' % (prefs_file, self._package)) - raise browser_gone_exception.BrowserGoneException( - 'Missing preferences file.') + # Start it up the first time so we can tweak the prefs. + self._adb.StartActivity(self._package, + self._activity, + True, + None, + None) + retries = 0 + while not self._adb.Adb().GetFileContents(prefs_file): + time.sleep(3) + retries += 1 + if retries == 3: + logging.critical('android_browser_backend: Could not find ' + 'preferences file %s for %s', + prefs_file, self._package) + raise browser_gone_exception.BrowserGoneException( + 'Missing preferences file.') + self._adb.KillAll(self._package) with tempfile.NamedTemporaryFile() as raw_f: self._adb.Pull(prefs_file, raw_f.name) |