Index: build/android/pylib/perf/setup.py |
diff --git a/build/android/pylib/perf/setup.py b/build/android/pylib/perf/setup.py |
index cf844560f00c944a178ff4d0858e8afc436003ab..0d07c961c470369a5e964d3034ea5766e31fb79e 100644 |
--- a/build/android/pylib/perf/setup.py |
+++ b/build/android/pylib/perf/setup.py |
@@ -6,14 +6,19 @@ |
import json |
import fnmatch |
+import logging |
import os |
+import psutil |
+import signal |
import shutil |
+import time |
from pylib import constants |
from pylib import forwarder |
-from pylib.perf import test_runner |
from pylib.utils import test_environment |
+import test_runner |
+ |
def Setup(test_options): |
"""Create and return the test runner factory and tests. |
@@ -59,7 +64,7 @@ def Setup(test_options): |
with file(test_options.flaky_steps, 'r') as f: |
flaky_steps = json.load(f) |
- def TestRunnerFactory(device, _shard_index): |
+ def TestRunnerFactory(device, shard_index): |
return test_runner.TestRunner( |
test_options, device, tests_dict, flaky_steps) |