Test Runner changes for @IntegrationTest.

Test Runner changes for @IntegrationTest.

Changes made to treat @IntegrationTest annotation as a test size annotation
with a timeout greater than @EnormousTest. Changes to test runner also made
to allow new line escapes for the .flags file.

BUG=None

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

[yojan, 2014-08-11 18:12:03]

Test runner changes have been made, could you please take a look.

Yojan

[klundberg, 2014-08-11 18:25:22]

LGTM but you need John's lgtm as well as.

[jbudorick, 2014-08-11 19:31:47]

https://codereview.chromium.org/462613005/diff/1/build/android/pylib/instrume...
File build/android/pylib/instrumentation/test_runner.py (right):

https://codereview.chromium.org/462613005/diff/1/build/android/pylib/instrume...
build/android/pylib/instrumentation/test_runner.py:169:
self.flags.AddFlags([flag.replace('\n','') \
nit: Just use strip() to remove the trailing newline (along with any trailing or
leading whitespace)

[jbudorick, 2014-08-11 19:59:30]

On 2014/08/11 19:31:47, jbudorick wrote:
>
https://codereview.chromium.org/462613005/diff/1/build/android/pylib/instrume...
> File build/android/pylib/instrumentation/test_runner.py (right):
> 
>
https://codereview.chromium.org/462613005/diff/1/build/android/pylib/instrume...
> build/android/pylib/instrumentation/test_runner.py:169:
> self.flags.AddFlags([flag.replace('\n','') \
> nit: Just use strip() to remove the trailing newline (along with any trailing
or
> leading whitespace)

fwiw, I had something like this in mind:

  stripped_flags = (l.strip() for l in device_flags_file)
  self.flags.AddFlags([flag for flag in stripped_flags if flag])

which catches all-whitespace lines, too, but I'm not sure that that would make
any actual difference.

[yojan, 2014-08-11 20:29:09]

On 2014/08/11 19:59:30, jbudorick wrote:
> On 2014/08/11 19:31:47, jbudorick wrote:
> >
>
https://codereview.chromium.org/462613005/diff/1/build/android/pylib/instrume...
> > File build/android/pylib/instrumentation/test_runner.py (right):
> > 
> >
>
https://codereview.chromium.org/462613005/diff/1/build/android/pylib/instrume...
> > build/android/pylib/instrumentation/test_runner.py:169:
> > self.flags.AddFlags([flag.replace('\n','') \
> > nit: Just use strip() to remove the trailing newline (along with any
trailing
> or
> > leading whitespace)
> 
> fwiw, I had something like this in mind:
> 
>   stripped_flags = (l.strip() for l in device_flags_file)
>   self.flags.AddFlags([flag for flag in stripped_flags if flag])
> 
> which catches all-whitespace lines, too, but I'm not sure that that would make
> any actual difference.

Done.

[jbudorick, 2014-08-12 20:50:34]

lgtm

[yojan, 2014-08-12 20:50:47]

The CQ bit was checked by yojan@google.com

[commit-bot: I haz the power, 2014-08-12 20:56:50]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/yojan@google.com/462613005/20001

[commit-bot: I haz the power, 2014-08-12 22:51:31]

Change committed as 289098