diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-09 05:00:24 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-09 05:00:24 +0000 |
| commit | 9af0dc0bfdcb2ba48a01074ed392739343254a84 (patch) | |
| tree | 55efd514d8b51c1ea0e5cc8752eb3b63e8dd9bf7 /tools | |
| parent | c772723af0387153881964029235dab388cbba6f (diff) | |
| download | chromium_src-9af0dc0bfdcb2ba48a01074ed392739343254a84.zip chromium_src-9af0dc0bfdcb2ba48a01074ed392739343254a84.tar.gz chromium_src-9af0dc0bfdcb2ba48a01074ed392739343254a84.tar.bz2 | |
[Telemetry] Fix CrOS lab performance tests.
This was broken by https://chromiumcodereview.appspot.com/21919002/ because
the testing_rsa file is not checked out by the CrOS telemetry deps. Since the
lab does not need the testing_rsa file, I'm only defaulting to that if the
file exists rather than adding an unnecessary file to deps.
Failure: http://cautotest/afe/#tab_id=view_job&object_id=4124067
BUG=None
Review URL: https://chromiumcodereview.appspot.com/22629003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216589 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/telemetry/telemetry/core/browser_options.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/telemetry/telemetry/core/browser_options.py b/tools/telemetry/telemetry/core/browser_options.py index d28bd3c..a77cf75 100644 --- a/tools/telemetry/telemetry/core/browser_options.py +++ b/tools/telemetry/telemetry/core/browser_options.py @@ -89,11 +89,15 @@ class BrowserOptions(optparse.Values): '--remote', dest='cros_remote', help='The IP address of a remote ChromeOS device to use.') + identity = None + testing_rsa = os.path.join( + util.GetChromiumSrcDir(), + 'third_party', 'chromite', 'ssh_keys', 'testing_rsa') + if os.path.exists(testing_rsa): + identity = testing_rsa group.add_option('--identity', dest='cros_ssh_identity', - default=os.path.join( - util.GetChromiumSrcDir(), - 'third_party', 'chromite', 'ssh_keys', 'testing_rsa'), + default=identity, help='The identity file to use when ssh\'ing into the ChromeOS device') parser.add_option_group(group) |