[Telemetry] Ensure run_benchmark sets the default values from AddCommandLineOptions.

[Telemetry] Ensure run_benchmark sets the default values from AddCommandLineOptions.

If a test adds its own command line options, we need to make sure those
are included in the options variable. Previously, AddCommandLineOptions
wasn't even called. Now we grab the defaults from it and then add those
to |options| as long as |options| hasn't already set them.

BUG=None

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=216815

[dtu, 2013-08-07 02:15:25]

https://codereview.chromium.org/22268006/diff/3001/tools/telemetry/telemetry/...
File tools/telemetry/telemetry/page/page_runner.py (right):

https://codereview.chromium.org/22268006/diff/3001/tools/telemetry/telemetry/...
tools/telemetry/telemetry/page/page_runner.py:219: 
Hrm, because this is a command-line thing, can it go into test.py?

[James Simonsen, 2013-08-07 18:28:20]

On 2013/08/07 02:15:25, Dave Tu wrote:
>
https://codereview.chromium.org/22268006/diff/3001/tools/telemetry/telemetry/...
> File tools/telemetry/telemetry/page/page_runner.py (right):
> 
>
https://codereview.chromium.org/22268006/diff/3001/tools/telemetry/telemetry/...
> tools/telemetry/telemetry/page/page_runner.py:219: 
> Hrm, because this is a command-line thing, can it go into test.py?

Done.

[James Simonsen, 2013-08-08 16:51:52]

Ping?

This is blocking 22300013.

[dtu, 2013-08-09 20:16:56]

lgtm

[commit-bot: I haz the power, 2013-08-09 20:21:33]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/simonjam@chromium.org/22268006/6001

[commit-bot: I haz the power, 2013-08-09 20:21:39]

Failed to apply patch for
tools/telemetry/telemetry/core/browser_options_unittest.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file tools/telemetry/telemetry/core/browser_options_unittest.py
  Hunk #2 FAILED at 59.
  1 out of 2 hunks FAILED -- saving rejects to file
tools/telemetry/telemetry/core/browser_options_unittest.py.rej

Patch:       tools/telemetry/telemetry/core/browser_options_unittest.py
Index: tools/telemetry/telemetry/core/browser_options_unittest.py
diff --git a/tools/telemetry/telemetry/core/browser_options_unittest.py
b/tools/telemetry/telemetry/core/browser_options_unittest.py
index
df22b930638271d951a5ddf5634425e4a7dfc252..935bd224f68acc92b769cc3453ccec7c3db213f2
100644
--- a/tools/telemetry/telemetry/core/browser_options_unittest.py
+++ b/tools/telemetry/telemetry/core/browser_options_unittest.py
@@ -1,6 +1,7 @@
 # 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 optparse
 import unittest
 
 from telemetry.core import browser_options
@@ -58,3 +59,29 @@ class BrowserOptionsTest(unittest.TestCase):
     options_ret, _ = parser.parse_args(['--browser', 'any'])
     self.assertEquals(options_ret, options)
     self.assertFalse(options.verbosity)
+
+  def testMergeDefaultValues(self):
+    options = browser_options.BrowserOptions()
+    options.already_true = True
+    options.already_false = False
+    options.override_to_true = False
+    options.override_to_false = True
+
+    parser = optparse.OptionParser()
+    parser.add_option('--already_true', action='store_true')
+    parser.add_option('--already_false', action='store_true')
+    parser.add_option('--unset', action='store_true')
+    parser.add_option('--default_true', action='store_true', default=True)
+    parser.add_option('--default_false', action='store_true', default=False)
+    parser.add_option('--override_to_true', action='store_true', default=False)
+    parser.add_option('--override_to_false', action='store_true', default=True)
+
+    options.MergeDefaultValues(parser.get_default_values())
+
+    self.assertTrue(options.already_true)
+    self.assertFalse(options.already_false)
+    self.assertIsNone(options.unset)
+    self.assertTrue(options.default_true)
+    self.assertFalse(options.default_false)
+    self.assertFalse(options.override_to_true)
+    self.assertTrue(options.override_to_false)

[commit-bot: I haz the power, 2013-08-09 20:32:03]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/simonjam@chromium.org/22268006/14001

[commit-bot: I haz the power, 2013-08-10 00:04:12]

Retried try job too often on win_rel for step(s) telemetry_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-08-10 00:06:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/simonjam@chromium.org/22268006/33001

[commit-bot: I haz the power, 2013-08-10 07:18:16]

Change committed as 216815