aboutsummaryrefslogtreecommitdiff
path: root/crb
diff options
context:
space:
mode:
authorCaroline Tice <cmtice@google.com>2016-07-20 12:52:59 -0700
committerchrome-bot <chrome-bot@chromium.org>2016-07-25 11:00:38 -0700
commita8af9a7a2462b00e72deff99327bdb452a715277 (patch)
tree92573f258457cc6a737c10df0dd250265b9efb8d /crb
parent19b6f5fc11dcf97144e9723c8f78534cce27423a (diff)
downloadtoolchain-utils-a8af9a7a2462b00e72deff99327bdb452a715277.tar.gz
[toolchain-utils] Finish switching utils/ to cros_utils/.
This CL finishes switching the subdirectory from 'utils' to 'cros_utils'. It changes all the remaining import statements to use 'cros_utils'; it removes the 'cros_utils' symlink, and it renames the 'utils' subdirectory to 'cros_utils'. BUG=chromium:568195 TEST=ran crosperf & binary search tool unittests. Change-Id: I7427f8bfb2ddac3a4b6108e46782039059684382 Reviewed-on: https://chrome-internal-review.googlesource.com/270396 Commit-Ready: Caroline Tice <cmtice@google.com> Tested-by: Caroline Tice <cmtice@google.com> Reviewed-by: Cassidy Burden <cburden@google.com> Reviewed-by: Luis Lozano <llozano@chromium.org>
Diffstat (limited to 'crb')
-rw-r--r--crb/autotest_run.py4
-rwxr-xr-xcrb/crb_driver.py4
-rw-r--r--crb/machine_manager_singleton.py4
3 files changed, 6 insertions, 6 deletions
diff --git a/crb/autotest_run.py b/crb/autotest_run.py
index b774419b..380c578b 100644
--- a/crb/autotest_run.py
+++ b/crb/autotest_run.py
@@ -9,8 +9,8 @@ import time
import image_chromeos
import machine_manager_singleton
import table_formatter
-from utils import command_executer
-from utils import logger
+from cros_utils import command_executer
+from cros_utils import logger
SCRATCH_DIR = '/home/%s/cros_scratch' % getpass.getuser()
PICKLE_FILE = 'pickle.txt'
diff --git a/crb/crb_driver.py b/crb/crb_driver.py
index 14fe6bab..8c767fb8 100755
--- a/crb/crb_driver.py
+++ b/crb/crb_driver.py
@@ -13,8 +13,8 @@ from email.mime.text import MIMEText
from autotest_gatherer import AutotestGatherer as AutotestGatherer
from autotest_run import AutotestRun as AutotestRun
from machine_manager_singleton import MachineManagerSingleton as MachineManagerSingleton
-from utils import logger
-from utils.file_utils import FileUtils
+from cros_utils import logger
+from cros_utils.file_utils import FileUtils
def CanonicalizeChromeOSRoot(chromeos_root):
diff --git a/crb/machine_manager_singleton.py b/crb/machine_manager_singleton.py
index f32e9ef6..6ffe9684 100644
--- a/crb/machine_manager_singleton.py
+++ b/crb/machine_manager_singleton.py
@@ -3,8 +3,8 @@ import lock_machine
import sys
import threading
import time
-from utils import command_executer
-from utils import logger
+from cros_utils import command_executer
+from cros_utils import logger
class CrosMachine(object):