Add support for ios_uirobot

build/android/pylib/base/test_run_factory.py

Index: build/android/pylib/base/test_run_factory.py
diff --git a/build/android/pylib/base/test_run_factory.py b/build/android/pylib/base/test_run_factory.py
index c8e0582034a500bf7c9a759967aa2fb2885a7b18..f220324fecee47c70fe1139f19c48b65dbcbbc8e 100644
--- a/build/android/pylib/base/test_run_factory.py
+++ b/build/android/pylib/base/test_run_factory.py
@@ -2,26 +2,47 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import os
+import sys
+
+from pylib import constants
 from pylib.gtest import gtest_test_instance
 from pylib.gtest import local_device_gtest_run
 from pylib.local.device import local_device_environment
 from pylib.remote.device import remote_device_environment
 from pylib.remote.device import remote_device_gtest_run
-from pylib.remote.device import remote_device_uirobot_run
-from pylib.uirobot import uirobot_test_instance
+from pylib.remote.device import (
+    remote_device_uirobot_run as android_remote_device_uirobot_run)
+from pylib.uirobot import uirobot_test_instance as android_uirobot_test_instance
+
+sys.path.append(os.path.join(
+    constants.DIR_SOURCE_ROOT, 'build', 'mobile'))
+from bling.pylib.uirobot import (

[jbudorick, 2015/01/09 22:06:50]

ios

[rnephew (Wrong account), 2015/01/09 23:35:36]

Done.

+    uirobot_test_instance as ios_uirobot_test_instance)
+from bling.pylib.remote.device import (

[jbudorick, 2015/01/09 22:06:50]

ios

[rnephew (Wrong account), 2015/01/09 23:35:36]

Done.

+    remote_device_uirobot_run as ios_remote_device_uirobot_run)
+
+def CreateTestRun(args, env, test_instance, error_func):
+  if args.device_type == 'Android':
+    if isinstance(env, local_device_environment.LocalDeviceEnvironment):
+      if isinstance(test_instance, gtest_test_instance.GtestTestInstance):
+        return local_device_gtest_run.LocalDeviceGtestRun(env, test_instance)
 
+    if isinstance(env, remote_device_environment.RemoteDeviceEnvironment):
+      if isinstance(test_instance, gtest_test_instance.GtestTestInstance):
+        return remote_device_gtest_run.RemoteDeviceGtestRun(env, test_instance)
+      if isinstance(test_instance,
+                    android_uirobot_test_instance.UirobotTestInstance):

[jbudorick, 2015/01/09 22:06:50]

I haven't gotten to the two implementations yet, but it'd be nice if we could
use the same uirobot_test_instance for both OSes.

[rnephew (Wrong account), 2015/01/09 23:35:36]

Done.

+        return android_remote_device_uirobot_run.RemoteDeviceUirobotRun(
+            env, test_instance)
 
-def CreateTestRun(_args, env, test_instance, error_func):
-  if isinstance(env, local_device_environment.LocalDeviceEnvironment):
-    if isinstance(test_instance, gtest_test_instance.GtestTestInstance):
-      return local_device_gtest_run.LocalDeviceGtestRun(env, test_instance)
+  if args.device_type == 'iOS':
+    if isinstance(env, remote_device_environment.RemoteDeviceEnvironment):
+      if isinstance(test_instance,
+                    ios_uirobot_test_instance.UirobotTestInstance):
+        return ios_remote_device_uirobot_run.RemoteDeviceUirobotRun(
+            env, test_instance)
 
-  if isinstance(env, remote_device_environment.RemoteDeviceEnvironment):
-    if isinstance(test_instance, gtest_test_instance.GtestTestInstance):
-      return remote_device_gtest_run.RemoteDeviceGtestRun(env, test_instance)
-    if isinstance(test_instance, uirobot_test_instance.UirobotTestInstance):
-      return remote_device_uirobot_run.RemoteDeviceUirobotRun(
-          env, test_instance)
 
   # TODO(jbudorick): Add local instrumentation test runs.
   # TODO(rnephew): Add remote_device instrumentation test runs.