Reland device filtering and device file cl

build/android/pylib/uirobot/uirobot_test_instance.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
+import json
+import logging
 
 from pylib import constants
 from pylib.base import test_instance
 from pylib.utils import apk_helper
 
 class UirobotTestInstance(test_instance.TestInstance):
 
   def __init__(self, args, error_func):
     """Constructor.
 
     Args:
       args: Command line arguments.
     """
     super(UirobotTestInstance, self).__init__()
     if not args.app_under_test:
       error_func('Must set --app-under-test.')
     self._app_under_test = args.app_under_test
+    self._minutes = args.minutes
 
-    if args.device_type == 'Android':
+    if args.remote_device_file:
+      with open(args.remote_device_file) as remote_device_file:
+        device_json = json.load(remote_device_file)
+    else:
+      device_json = {}
+
+    device_type = device_json.get('device_type', 'Android')

[jbudorick, 2015/02/02 20:28:54]

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]

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.

+    if args.device_type:
+      if device_type and device_type != args.device_type:
+        logging.info('Overriding device_type from %s to %s',
+                     device_type, args.device_type)
+      device_type = args.device_type
+
+    if device_type == 'Android':
       self._suite = 'Android Uirobot'
       self._package_name = apk_helper.GetPackageName(self._app_under_test)
-
-    elif args.device_type == 'iOS':
+    elif device_type == 'iOS':
       self._suite = 'iOS Uirobot'
       self._package_name = self._app_under_test
 
-    self._minutes = args.minutes
 
   #override
   def TestType(self):
     """Returns type of test."""
     return 'uirobot'
 
   #override
   def SetUp(self):
     """Setup for test."""
     pass
@@ skipping 14 matching lines @@
     return self._minutes
 
   @property
   def package_name(self):
     """Returns the name of the package in the APK."""
     return self._package_name
 
   @property
   def suite(self):
     return self._suite