Index: build/android/pylib/base/base_test_sharder.py |
diff --git a/build/android/pylib/base_test_sharder.py b/build/android/pylib/base/base_test_sharder.py |
similarity index 95% |
rename from build/android/pylib/base_test_sharder.py |
rename to build/android/pylib/base/base_test_sharder.py |
index 387038d070bd478b2ca4be287b7a96265ace8e05..73621010f055b115537417409c201347d251e36d 100644 |
--- a/build/android/pylib/base_test_sharder.py |
+++ b/build/android/pylib/base/base_test_sharder.py |
@@ -3,13 +3,12 @@ |
# found in the LICENSE file. |
-import android_commands |
import logging |
import multiprocessing |
-from android_commands import errors |
-from forwarder import Forwarder |
-from test_result import TestResults |
+from pylib import android_commands |
+from pylib.base.test_result import TestResults |
+from pylib.forwarder import Forwarder |
def _ShardedTestRunnable(test): |
@@ -102,7 +101,7 @@ class BaseTestSharder(object): |
logging.warning('*' * 80) |
test_runner = self.CreateShardedTestRunner(device, index) |
test_runners += [test_runner] |
- except errors.DeviceUnresponsiveError as e: |
+ except android_commands.errors.DeviceUnresponsiveError as e: |
logging.critical('****Failed to create a shard: [%s]', e) |
self.attached_devices.remove(device) |
continue |
@@ -116,7 +115,7 @@ class BaseTestSharder(object): |
async_results = pool.map_async(_ShardedTestRunnable, test_runners) |
try: |
results_lists = async_results.get(999999) |
- except errors.DeviceUnresponsiveError as e: |
+ except android_commands.errors.DeviceUnresponsiveError as e: |
logging.critical('****Failed to run test: [%s]', e) |
self.attached_devices = android_commands.GetAttachedDevices() |
continue |