[Android] Add support for timeouts scaling for OnDevice instrumentation.

[Android] Add support for timeouts scaling for OnDevice instrumentation.

This adds support for using the test_runner --timeout-scale arg.
However, the TimeoutScale annotation still currently doesn't
work for remote instrumentation tests.

BUG=

Committed: https://crrev.com/37b3817940096f8dd593cb32eabb3774f2302d7b
Cr-Commit-Position: refs/heads/master@{#364238}

[mikecase (-- gone --), 2015-12-03 00:11:16]

mikecase@chromium.org changed reviewers:
+ jbudorick@chromium.org, rnephew@chromium.org

[mikecase (-- gone --), 2015-12-03 00:11:16]

This seemed to be by far the most straightforward way to get timeout scaling to
work for remote instrumentation tests. Tell me what you think!

[rnephew (Wrong account), 2015-12-03 00:24:40]

On 2015/12/03 00:11:16, mikecase wrote:
> This seemed to be by far the most straightforward way to get timeout scaling
to
> work for remote instrumentation tests. Tell me what you think!

lgtm with one question.

[rnephew (Wrong account), 2015-12-03 00:24:51]

rnephew@google.com changed reviewers:
+ rnephew@google.com

[rnephew (Wrong account), 2015-12-03 00:24:52]

https://codereview.chromium.org/1493953002/diff/20001/base/test/android/javat...
File
base/test/android/javatests/src/org/chromium/base/test/util/ScalableTimeout.java
(right):

https://codereview.chromium.org/1493953002/diff/20001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/util/ScalableTimeout.java:16:
public static final String PROPERTY_FILE =
"/data/local/tmp/chrome_timeout_scale";
Is there any reason this shouldn't be made public? If so, it looks like it is
just getting the data and not changing it so a getter would do what you need.

[mikecase (-- gone --), 2015-12-03 00:46:11]

https://codereview.chromium.org/1493953002/diff/20001/base/test/android/javat...
File
base/test/android/javatests/src/org/chromium/base/test/util/ScalableTimeout.java
(right):

https://codereview.chromium.org/1493953002/diff/20001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/util/ScalableTimeout.java:16:
public static final String PROPERTY_FILE =
"/data/local/tmp/chrome_timeout_scale";
On 2015/12/03 at 00:24:52, rnephew wrote:
> Is there any reason this shouldn't be made public? If so, it looks like it is
just getting the data and not changing it so a getter would do what you need.

Since it's final and static, I think it should be fine to just make it public
and access it directly (I saw some public static final filenames similar to this
in the codebase).
Leaving as is unless you tell me you prefer otherwise.

[mikecase (-- gone --), 2015-12-03 00:51:17]

mikecase@chromium.org changed reviewers:
+ nyquist@chromium.org

[mikecase (-- gone --), 2015-12-03 00:51:17]

+nyquist@chromium.org for owner of testing/android

[jbudorick, 2015-12-03 00:54:11]

https://codereview.chromium.org/1493953002/diff/20001/testing/android/driver/...
File
testing/android/driver/java/src/org/chromium/test/driver/OnDeviceInstrumentationDriver.java
(right):

https://codereview.chromium.org/1493953002/diff/20001/testing/android/driver/...
testing/android/driver/java/src/org/chromium/test/driver/OnDeviceInstrumentationDriver.java:113:
OutputStreamWriter outputStreamWriter = new OutputStreamWriter(
I'm concerned that this changes the state of a file on the device and doesn't
clean up after itself.

[mikecase (-- gone --), 2015-12-03 02:04:41]

https://codereview.chromium.org/1493953002/diff/20001/testing/android/driver/...
File
testing/android/driver/java/src/org/chromium/test/driver/OnDeviceInstrumentationDriver.java
(right):

https://codereview.chromium.org/1493953002/diff/20001/testing/android/driver/...
testing/android/driver/java/src/org/chromium/test/driver/OnDeviceInstrumentationDriver.java:113:
OutputStreamWriter outputStreamWriter = new OutputStreamWriter(
On 2015/12/03 at 00:54:11, jbudorick wrote:
> I'm concerned that this changes the state of a file on the device and doesn't
clean up after itself.

Fixed. Now clean up file if I write it.

[nyquist, 2015-12-03 23:37:53]

https://codereview.chromium.org/1493953002/diff/40001/testing/android/driver/...
File
testing/android/driver/java/src/org/chromium/test/driver/OnDeviceInstrumentationDriver.java
(right):

https://codereview.chromium.org/1493953002/diff/40001/testing/android/driver/...
testing/android/driver/java/src/org/chromium/test/driver/OnDeviceInstrumentationDriver.java:148:
public void onDestroy() {
Is this always called? Such as if there's a crash or something in a test, will
this be guaranteed to be called?

[mikecase (-- gone --), 2015-12-04 17:26:16]

https://codereview.chromium.org/1493953002/diff/40001/testing/android/driver/...
File
testing/android/driver/java/src/org/chromium/test/driver/OnDeviceInstrumentationDriver.java
(right):

https://codereview.chromium.org/1493953002/diff/40001/testing/android/driver/...
testing/android/driver/java/src/org/chromium/test/driver/OnDeviceInstrumentationDriver.java:148:
public void onDestroy() {
On 2015/12/03 at 23:37:53, nyquist wrote:
> Is this always called? Such as if there's a crash or something in a test, will
this be guaranteed to be called?

This OnDeviceInstrumentationDriver is in a completely separate process to the
actual tests being run. If a test crashes, this will not crash (what will happen
is the OnDeviceInstrumentionBroker [which this starts up] will just timeout
while waiting to hear back the test result.)

[nyquist, 2015-12-08 20:58:52]

lgtm

https://codereview.chromium.org/1493953002/diff/40001/testing/android/driver/...
File
testing/android/driver/java/src/org/chromium/test/driver/OnDeviceInstrumentationDriver.java
(right):

https://codereview.chromium.org/1493953002/diff/40001/testing/android/driver/...
testing/android/driver/java/src/org/chromium/test/driver/OnDeviceInstrumentationDriver.java:148:
public void onDestroy() {
On 2015/12/04 17:26:16, mikecase wrote:
> On 2015/12/03 at 23:37:53, nyquist wrote:
> > Is this always called? Such as if there's a crash or something in a test,
will
> this be guaranteed to be called?
> 
> This OnDeviceInstrumentationDriver is in a completely separate process to the
> actual tests being run. If a test crashes, this will not crash (what will
happen
> is the OnDeviceInstrumentionBroker [which this starts up] will just timeout
> while waiting to hear back the test result.)

I see.

I guess if it ends up causing issues, we could do this delete as an else-clause
in onCreate() instead.

[mikecase (-- gone --), 2015-12-09 01:16:07]

The CQ bit was checked by mikecase@chromium.org

[mikecase (-- gone --), 2015-12-09 01:16:07]

The patchset sent to the CQ was uploaded after l-g-t-m from rnephew@google.com
Link to the patchset: https://codereview.chromium.org/1493953002/#ps40001
(title: "Clean up timeout_scale file.")

[commit-bot: I haz the power, 2015-12-09 01:35:03]

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

[commit-bot: I haz the power, 2015-12-09 02:11:02]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-12-09 02:11:02]

Try jobs failed on following builders:
  android_chromium_gn_compile_rel on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/android_chromiu...)

[mikecase (-- gone --), 2015-12-09 22:09:57]

The CQ bit was checked by mikecase@chromium.org

[mikecase (-- gone --), 2015-12-09 22:09:58]

The patchset sent to the CQ was uploaded after l-g-t-m from
nyquist@chromium.org, rnephew@google.com
Link to the patchset: https://codereview.chromium.org/1493953002/#ps60001
(title: "Added wrong GN dependency.")

[commit-bot: I haz the power, 2015-12-09 22:13:59]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1493953002/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1493953002/60001

[commit-bot: I haz the power, 2015-12-10 01:16:23]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2015-12-10 01:16:56]

Description was changed from

==========
[Android] Add support for timeouts scaling for OnDevice instrumentation.

This adds support for using the test_runner --timeout-scale arg.
However, the TimeoutScale annotation still currently doesn't
work for remote instrumentation tests.

BUG=
==========

to

==========
[Android] Add support for timeouts scaling for OnDevice instrumentation.

This adds support for using the test_runner --timeout-scale arg.
However, the TimeoutScale annotation still currently doesn't
work for remote instrumentation tests.

BUG=

Committed: https://crrev.com/37b3817940096f8dd593cb32eabb3774f2302d7b
Cr-Commit-Position: refs/heads/master@{#364238}
==========

[commit-bot: I haz the power, 2015-12-10 01:16:56]

Patchset 4 (id:??) landed as
https://crrev.com/37b3817940096f8dd593cb32eabb3774f2302d7b
Cr-Commit-Position: refs/heads/master@{#364238}