diff options
| author | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 20:59:51 +0000 |
|---|---|---|
| committer | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 20:59:51 +0000 |
| commit | a2d126e6e7b228ee01eae7c0f5dde2c4048d3ff7 (patch) | |
| tree | b47b90fcf05e7b988bada04017e16615242de2bd /tools/telemetry | |
| parent | a43612d355fbbaecb5b960694171500af0cc6a9d (diff) | |
| download | chromium_src-a2d126e6e7b228ee01eae7c0f5dde2c4048d3ff7.zip chromium_src-a2d126e6e7b228ee01eae7c0f5dde2c4048d3ff7.tar.gz chromium_src-a2d126e6e7b228ee01eae7c0f5dde2c4048d3ff7.tar.bz2 | |
Support for system-guest on cros.
Add an explicit test comparing pids to ensure that the browser has restarted - this fixes a race.
BUG=244579
TEST=manual
NOTRY=True
Review URL: https://chromiumcodereview.appspot.com/16332003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204039 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/telemetry')
| -rw-r--r-- | tools/telemetry/telemetry/core/chrome/cros_browser_backend.py | 4 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/core/chrome/cros_browser_finder.py | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py b/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py index 996a869..70400e7 100644 --- a/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py +++ b/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py @@ -111,9 +111,11 @@ class CrOSBrowserBackend(browser_backend.BrowserBackend): 'with chrome branches 1500 or earlier.') if self._is_guest: + pid = self.pid cros_util.NavigateGuestLogin(self, cri) # Guest browsing shuts down the current browser and launches an incognito - # browser, which we need to wait for. + # browser in a separate process, which we need to wait for. + util.WaitFor(lambda: pid != self.pid, 10) self._WaitForBrowserToComeUp() else: cros_util.NavigateLogin(self) diff --git a/tools/telemetry/telemetry/core/chrome/cros_browser_finder.py b/tools/telemetry/telemetry/core/chrome/cros_browser_finder.py index 8e9c32b..16b6926 100644 --- a/tools/telemetry/telemetry/core/chrome/cros_browser_finder.py +++ b/tools/telemetry/telemetry/core/chrome/cros_browser_finder.py @@ -17,6 +17,7 @@ from telemetry.core.platform import cros_platform_backend ALL_BROWSER_TYPES = ','.join([ 'cros-chrome', 'cros-chrome-guest', + 'system-guest', ]) class PossibleCrOSBrowser(possible_browser.PossibleBrowser): @@ -53,7 +54,10 @@ def FindAllAvailableBrowsers(options): if res.count('CHROMEOS_RELEASE_NAME'): return [PossibleCrOSBrowser('system', options, cros_interface.CrOSInterface(), - is_guest=False)] + is_guest=False), + PossibleCrOSBrowser('system-guest', options, + cros_interface.CrOSInterface(), + is_guest=True)] if options.cros_remote == None: logging.debug('No --remote specified, will not probe for CrOS.') |