Reland device filtering and device file cl

Reland device filtering and device file cl

Add multiple device/os filtering and a config file.

BUG=

Committed: https://crrev.com/efe44b454eda549fba4cda3a6e988c11435b8cc6
Cr-Commit-Position: refs/heads/master@{#314505}

[rnephew (Wrong account), 2015-02-02 20:03:43]

rnephew@google.com changed reviewers:
+ jbudorick@chromium.org, rnephew@google.com

[jbudorick, 2015-02-02 20:28:55]

https://codereview.chromium.org/891423002/diff/1/build/android/pylib/uirobot/...
File build/android/pylib/uirobot/uirobot_test_instance.py (right):

https://codereview.chromium.org/891423002/diff/1/build/android/pylib/uirobot/...
build/android/pylib/uirobot/uirobot_test_instance.py:33: device_type =
device_json.get('device_type', 'Android')
from the other review:

Perhaps we should either:
 - have the remote_device_file parsing logic elsewhere (i.e. outside both the
environment and the test instance), or
 - have this suite and package_name logic in the test run s.t. it has access to
the environment

[rnephew (Wrong account), 2015-02-02 20:41:03]

https://codereview.chromium.org/891423002/diff/1/build/android/pylib/uirobot/...
File build/android/pylib/uirobot/uirobot_test_instance.py (right):

https://codereview.chromium.org/891423002/diff/1/build/android/pylib/uirobot/...
build/android/pylib/uirobot/uirobot_test_instance.py:33: device_type =
device_json.get('device_type', 'Android')
On 2015/02/02 20:28:54, jbudorick wrote:
> from the other review:
> 
> Perhaps we should either:
>  - have the remote_device_file parsing logic elsewhere (i.e. outside both the
> environment and the test instance), or
>  - have this suite and package_name logic in the test run s.t. it has access
to
> the environment

Alternatively, I was thinking of having device_type not being set-able from the
file, and having to be overridden from 'Android' from the command line. This is
the only test that will have problems with it I think, since its the only one
thats running both Android and iOS.

[jbudorick, 2015-02-02 21:32:49]

https://codereview.chromium.org/891423002/diff/20001/build/android/pylib/remo...
File build/android/pylib/remote/device/remote_device_environment.py (right):

https://codereview.chromium.org/891423002/diff/20001/build/android/pylib/remo...
build/android/pylib/remote/device/remote_device_environment.py:45: #  
"remote_device": ["Galaxy S4", "Galaxy S3"],
It seems a little weird (and inconsistent) to support all of these parameters in
the remote_device_file but not device_type.

[rnephew (Wrong account), 2015-02-04 01:37:21]

https://codereview.chromium.org/891423002/diff/20001/build/android/pylib/remo...
File build/android/pylib/remote/device/remote_device_environment.py (right):

https://codereview.chromium.org/891423002/diff/20001/build/android/pylib/remo...
build/android/pylib/remote/device/remote_device_environment.py:45: #  
"remote_device": ["Galaxy S4", "Galaxy S3"],
On 2015/02/02 21:32:49, jbudorick wrote:
> It seems a little weird (and inconsistent) to support all of these parameters
in
> the remote_device_file but not device_type.

Back to the double parsing to fix this issue.

[jbudorick, 2015-02-04 02:06:02]

lgtm w/ nit

https://codereview.chromium.org/891423002/diff/40001/build/android/pylib/remo...
File build/android/pylib/remote/device/remote_device_environment.py (right):

https://codereview.chromium.org/891423002/diff/40001/build/android/pylib/remo...
build/android/pylib/remote/device/remote_device_environment.py:75:
self._device_oem = device_json.get('device_oem', None)
nit: alphabetize these two.

[rnephew (Reviews Here), 2015-02-04 02:37:03]

New patchsets have been uploaded after l-g-t-m from jbudorick@chromium.org

[rnephew (Wrong account), 2015-02-04 02:37:09]

https://codereview.chromium.org/891423002/diff/40001/build/android/pylib/remo...
File build/android/pylib/remote/device/remote_device_environment.py (right):

https://codereview.chromium.org/891423002/diff/40001/build/android/pylib/remo...
build/android/pylib/remote/device/remote_device_environment.py:75:
self._device_oem = device_json.get('device_oem', None)
On 2015/02/04 02:06:02, jbudorick wrote:
> nit: alphabetize these two.

Done.

[rnephew (Wrong account), 2015-02-04 02:37:39]

The CQ bit was checked by rnephew@google.com

[commit-bot: I haz the power, 2015-02-04 02:38:45]

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

[commit-bot: I haz the power, 2015-02-04 04:45:44]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2015-02-04 04:47:34]

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