Test Runner changes for Integration tests.

Test Runner changes for Integration tests.

Test Runner changes to allow integration tests as well as the ability
to point the device's google_base_url (or any android shell flag) to
a specified value in stored in a .flags file.

BUG=None

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

[yojan, 2014-08-07 17:36:29]

Hi,

Please take a look at this changelist for the test runner changes.

Thanks!

Yojan

[jbudorick, 2014-08-07 18:02:46]

https://codereview.chromium.org/444243002/diff/20001/build/android/pylib/inst...
File build/android/pylib/instrumentation/test_options.py (right):

https://codereview.chromium.org/444243002/diff/20001/build/android/pylib/inst...
build/android/pylib/instrumentation/test_options.py:26: 'device_flags'])
You'll need to add this in b/a/pylib/uiautomator/test_runner.py. It creates an
instance of InstrumentationOptions.

https://codereview.chromium.org/444243002/diff/20001/build/android/test_runne...
File build/android/test_runner.py (right):

https://codereview.chromium.org/444243002/diff/20001/build/android/test_runne...
build/android/test_runner.py:605: options.device_flags = '%s/%s' %
(constants.DIR_SOURCE_ROOT,
This is a file on the host, so it should be

  os.path.join(constants.DIR_SOURCE_ROOT, options.device_flags)

not

  '%s/%s' % (constants.DIR_SOURCE_ROOT, options.device_flags)

(Perhaps the example I pointed out should be doing the same...)

[yojan, 2014-08-07 18:33:39]

Changes made including the example.

On 2014/08/07 18:02:46, jbudorick wrote:
>
https://codereview.chromium.org/444243002/diff/20001/build/android/pylib/inst...
> File build/android/pylib/instrumentation/test_options.py (right):
> 
>
https://codereview.chromium.org/444243002/diff/20001/build/android/pylib/inst...
> build/android/pylib/instrumentation/test_options.py:26: 'device_flags'])
> You'll need to add this in b/a/pylib/uiautomator/test_runner.py. It creates an
> instance of InstrumentationOptions.
> 
>
https://codereview.chromium.org/444243002/diff/20001/build/android/test_runne...
> File build/android/test_runner.py (right):
> 
>
https://codereview.chromium.org/444243002/diff/20001/build/android/test_runne...
> build/android/test_runner.py:605: options.device_flags = '%s/%s' %
> (constants.DIR_SOURCE_ROOT,
> This is a file on the host, so it should be
> 
>   os.path.join(constants.DIR_SOURCE_ROOT, options.device_flags)
> 
> not
> 
>   '%s/%s' % (constants.DIR_SOURCE_ROOT, options.device_flags)
> 
> (Perhaps the example I pointed out should be doing the same...)

[jbudorick, 2014-08-07 18:42:16]

lgtm w/ nit

https://codereview.chromium.org/444243002/diff/40001/build/android/pylib/inst...
File build/android/pylib/instrumentation/test_runner.py (right):

https://codereview.chromium.org/444243002/diff/40001/build/android/pylib/inst...
build/android/pylib/instrumentation/test_runner.py:169:
self.flags.AddFlags([flag for flag in device_flags_file])
nit: can this just be list(device_flags_file)?

[klundberg, 2014-08-07 20:06:29]

lgtm

[yojan, 2014-08-07 21:52:56]

The CQ bit was checked by yojan@google.com

[commit-bot: I haz the power, 2014-08-07 22:21:31]

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

[commit-bot: I haz the power, 2014-08-08 00:25:48]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  win_chromium_x64_rel on tryserver.chromium.win
(http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_...)

[commit-bot: I haz the power, 2014-08-08 01:46:04]

Change committed as 288202