Add multiple device/os filtering and a config file.

build/android/test_runner.py

Index: build/android/test_runner.py
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index 6eb368af41e282a8ec1f87a174afd94ff203356c..5d4199bbbc6e9ccc9c08d4ac128d3a1caa5f3440 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -129,8 +129,6 @@ def AddRemoteDeviceOptions(parser):
                            'Gets test_run_id from given file path.'))
   group.add_argument('--remote-device', default='',
                      help='Device type to run test on.')
-  group.add_argument('--remote-device-os', default='',
-                     help='OS to have on the device.')
   group.add_argument('--results-path', default='',
                      help='File path to download results to.')
   group.add_argument('--api-protocol',
@@ -143,6 +141,14 @@ def AddRemoteDeviceOptions(parser):
   group.add_argument('--device-type', default='Android',
                      choices=constants.VALID_DEVICE_TYPES,
                      help=('Type of device to run on. iOS or android'))
+  group.add_argument('--remote-device-file', help=('File with JSON to select'
+                     ' remote device. Overrides all other flags.'))

[jbudorick, 2015/01/27 17:58:55]

I imagine this and remote-device + remote-device-os should be mutually
exclusive.

[rnephew (Wrong account), 2015/01/27 18:46:21]

Under my current implementation you can set somethings from the command line. So
you could have --remote-device set on the command line and not have it present
in the config file, but have other things set there. Doing that would get rid of
this; is that ok?

[jbudorick, 2015/01/27 20:01:50]

I think we should start by supporting a user providing either the
remote-device-file or everything it provides, but not both concurrently. We can
always revisit that if users (or bots) want to mix the two.

[rnephew (Wrong account), 2015/01/27 21:07:22]

Done.

+
+  device_os_group = group.add_mutually_exclusive_group()
+  device_os_group.add_argument('--remote-device-minimum-os',
+                               help='Minimum OS on device.')
+  device_os_group.add_argument('--remote-device-os', default='',
+                               help='OS to have on the device.')
 
   api_secret_group = group.add_mutually_exclusive_group()
   api_secret_group.add_argument('--api-secret', default='',