Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2629)

Unified Diff: build/android/pylib/base/test_run_factory.py

Issue 2488453002: [android] Remove pylib/{remote,uirobot}. (Closed)
Patch Set: Remove remote_device_dummy_apk from rules.gni. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/pylib/base/test_instance_factory.py ('k') | build/android/pylib/constants/__init__.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 46c807633a71725f760278c4f423443683c8ffb2..04a8f3cabaf63d2ee7d4123790cbacc50066494d 100644
--- a/build/android/pylib/base/test_run_factory.py
+++ b/build/android/pylib/base/test_run_factory.py
@@ -9,18 +9,6 @@ from pylib.local.device import local_device_gtest_run
from pylib.local.device import local_device_instrumentation_test_run
from pylib.local.device import local_device_perf_test_run
from pylib.perf import perf_test_instance
-from pylib.uirobot import uirobot_test_instance
-
-try:
- from pylib.remote.device import remote_device_environment
- from pylib.remote.device import remote_device_gtest_run
- from pylib.remote.device import remote_device_instrumentation_test_run
- from pylib.remote.device import remote_device_uirobot_test_run
-except ImportError:
- remote_device_environment = None
- remote_device_gtest_run = None
- remote_device_instrumentation_test_run = None
- remote_device_uirobot_test_run = None
def _CreatePerfTestRun(args, env, test_instance):
@@ -46,25 +34,6 @@ def CreateTestRun(args, env, test_instance, error_func):
perf_test_instance.PerfTestInstance):
return _CreatePerfTestRun(args, env, test_instance)
- if (remote_device_environment
- and isinstance(env, remote_device_environment.RemoteDeviceEnvironment)):
- # The remote_device modules should be all or nothing.
- assert (remote_device_gtest_run
- and remote_device_instrumentation_test_run
- and remote_device_uirobot_test_run)
-
- if isinstance(test_instance, gtest_test_instance.GtestTestInstance):
- return remote_device_gtest_run.RemoteDeviceGtestTestRun(
- env, test_instance)
- if isinstance(test_instance,
- instrumentation_test_instance.InstrumentationTestInstance):
- return (remote_device_instrumentation_test_run
- .RemoteDeviceInstrumentationTestRun(env, test_instance))
- if isinstance(test_instance, uirobot_test_instance.UirobotTestInstance):
- return remote_device_uirobot_test_run.RemoteDeviceUirobotTestRun(
- env, test_instance)
-
-
error_func('Unable to create test run for %s tests in %s environment'
% (str(test_instance), str(env)))
« no previous file with comments | « build/android/pylib/base/test_instance_factory.py ('k') | build/android/pylib/constants/__init__.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698