Fixed merge error in benchmark.py which removed the predicate variable.

Fixed merge error in benchmark.py which removed the predicate variable.

Passed in argument was not meant to be deleted upon merge:
https://codereview.chromium.org/920523002

BUG=457385
TEST=trybots

Committed: https://crrev.com/904730fb54ff2fe436ef098f24f2352fd7e73b99
Cr-Commit-Position: refs/heads/master@{#317718}

[David Yen, 2015-02-23 21:00:22]

dyen@chromium.org changed reviewers:
+ eakuefner@chromium.org, nednguyen@google.com

[David Yen, 2015-02-23 21:00:22]

I fixed a bad merge in benchmark.py and also added a unit test for it. Let me
know if anyone has any suggestions on how to better test this case.

[nednguyen, 2015-02-23 21:15:45]

lgtm

[nednguyen, 2015-02-23 21:18:46]

https://codereview.chromium.org/954503003/diff/1/tools/telemetry/telemetry/be...
File tools/telemetry/telemetry/benchmark_unittest.py (right):

https://codereview.chromium.org/954503003/diff/1/tools/telemetry/telemetry/be...
tools/telemetry/telemetry/benchmark_unittest.py:150: parser =
options.CreateParser()
fyi, this is an expensive operation:
https://groups.google.com/a/chromium.org/forum/#!topic/telemetry/yW9Ve9_CnX8

Can we change this to  optparse.OptionParser()?

[eakuefner, 2015-02-23 21:21:37]

https://codereview.chromium.org/954503003/diff/1/tools/telemetry/telemetry/be...
File tools/telemetry/telemetry/benchmark_unittest.py (right):

https://codereview.chromium.org/954503003/diff/1/tools/telemetry/telemetry/be...
tools/telemetry/telemetry/benchmark_unittest.py:138: validPredicate = [False]
Nit: blank line before and after the function definition?

[David Yen, 2015-02-23 21:42:30]

https://codereview.chromium.org/954503003/diff/1/tools/telemetry/telemetry/be...
File tools/telemetry/telemetry/benchmark_unittest.py (right):

https://codereview.chromium.org/954503003/diff/1/tools/telemetry/telemetry/be...
tools/telemetry/telemetry/benchmark_unittest.py:138: validPredicate = [False]
On 2015/02/23 21:21:37, eakuefner wrote:
> Nit: blank line before and after the function definition?

Done.

https://codereview.chromium.org/954503003/diff/1/tools/telemetry/telemetry/be...
tools/telemetry/telemetry/benchmark_unittest.py:150: parser =
options.CreateParser()
On 2015/02/23 21:18:46, nednguyen wrote:
> fyi, this is an expensive operation:
> https://groups.google.com/a/chromium.org/forum/#!topic/telemetry/yW9Ve9_CnX8
> 
> Can we change this to  optparse.OptionParser()?

Done. Also did the same fix above.

[eakuefner, 2015-02-23 21:44:06]

lgtm

[David Yen, 2015-02-23 21:48:56]

The CQ bit was checked by dyen@chromium.org

[David Yen, 2015-02-23 21:48:56]

The patchset sent to the CQ was uploaded after l-g-t-m from nednguyen@google.com
Link to the patchset: https://codereview.chromium.org/954503003/#ps20001 (title:
"Fix pylint error, applied suggestions")

[commit-bot: I haz the power, 2015-02-23 21:49:29]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/954503003/20001

[David Yen, 2015-02-23 21:52:27]

The CQ bit was unchecked by dyen@chromium.org

[David Yen, 2015-02-23 21:59:29]

The CQ bit was checked by dyen@chromium.org

[David Yen, 2015-02-23 21:59:29]

The patchset sent to the CQ was uploaded after l-g-t-m from
eakuefner@chromium.org, nednguyen@google.com
Link to the patchset: https://codereview.chromium.org/954503003/#ps40001 (title:
"Fixed optparse module name")

[commit-bot: I haz the power, 2015-02-23 22:00:45]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/954503003/40001

[commit-bot: I haz the power, 2015-02-24 01:17:51]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2015-02-24 01:18:47]

Patchset 3 (id:??) landed as
https://crrev.com/904730fb54ff2fe436ef098f24f2352fd7e73b99
Cr-Commit-Position: refs/heads/master@{#317718}