[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>

50 files changed, 62 insertions, 63 deletions

diff --git a/afe_lock_machine.py b/afe_lock_machine.py
index da518d59..4accb038 100755
--- a/afe_lock_machine.py
+++ b/afe_lock_machine.py
@@ -11,8 +11,8 @@ import os
 import sys
 import traceback
 
-from utils import logger
-from utils import machines
+from cros_utils import logger
+from cros_utils import machines
 
 
 class AFELockException(Exception):
@@ -99,7 +99,7 @@ class AFELockManager(object):
         server to be used (see local_server argument).
       log: If not None, this is the logger object to be used for writing out
         informational output messages.  It is expected to be an instance of
-        Logger class from utils/logger.py.
+        Logger class from cros_utils/logger.py.
     """
     self.chromeos_root = chromeos_root
     self.user = getpass.getuser()
diff --git a/binary_search_tool/binary_search_state.py b/binary_search_tool/binary_search_state.py
index 603c8523..1f797281 100755
--- a/binary_search_tool/binary_search_state.py
+++ b/binary_search_tool/binary_search_state.py
@@ -11,12 +11,12 @@ import sys
 import tempfile
 import time
 
-# Adds utils to PYTHONPATH
+# Adds cros_utils to PYTHONPATH
 import common
 
-# Now we do import from utils
-from utils import command_executer
-from utils import logger
+# Now we do import from cros_utils
+from cros_utils import command_executer
+from cros_utils import logger
 
 import binary_search_perforce
 
diff --git a/binary_search_tool/bisect.py b/binary_search_tool/bisect.py
index 4ce87cd2..235e9546 100755
--- a/binary_search_tool/bisect.py
+++ b/binary_search_tool/bisect.py
@@ -11,8 +11,8 @@ from argparse import RawTextHelpFormatter
 
 import common
 
-from utils import command_executer
-from utils import logger
+from cros_utils import command_executer
+from cros_utils import logger
 
 import binary_search_state
 
diff --git a/binary_search_tool/test/binary_search_tool_tester.py b/binary_search_tool/test/binary_search_tool_tester.py
index c6656f65..23cc0096 100755
--- a/binary_search_tool/test/binary_search_tool_tester.py
+++ b/binary_search_tool/test/binary_search_tool_tester.py
@@ -12,7 +12,7 @@ import random
 import sys
 import unittest
 
-from utils import command_executer
+from cros_utils import command_executer
 from binary_search_tool import binary_search_state
 from binary_search_tool import bisect
 
diff --git a/binary_search_tool/test/gen_init_list.py b/binary_search_tool/test/gen_init_list.py
index e840973c..10db5240 100755
--- a/binary_search_tool/test/gen_init_list.py
+++ b/binary_search_tool/test/gen_init_list.py
@@ -5,7 +5,7 @@ from __future__ import print_function
 
 import sys
 
-from utils import command_executer
+from cros_utils import command_executer
 import common
 
 
diff --git a/buildbot_test_llvm.py b/buildbot_test_llvm.py
index 02c991bc..6df77189 100755
--- a/buildbot_test_llvm.py
+++ b/buildbot_test_llvm.py
@@ -18,10 +18,10 @@ import os
 import sys
 import time
 
-from utils import command_executer
-from utils import logger
+from cros_utils import command_executer
+from cros_utils import logger
 
-from utils import buildbot_utils
+from cros_utils import buildbot_utils
 
 # CL that uses LLVM to build the peppy image.
 USE_LLVM_PATCH = '295217'
diff --git a/buildbot_test_toolchains.py b/buildbot_test_toolchains.py
index 4cad4c7a..1535afde 100755
--- a/buildbot_test_toolchains.py
+++ b/buildbot_test_toolchains.py
@@ -19,10 +19,10 @@ import re
 import sys
 import time
 
-from utils import command_executer
-from utils import logger
+from cros_utils import command_executer
+from cros_utils import logger
 
-from utils import buildbot_utils
+from cros_utils import buildbot_utils
 
 # CL that updated GCC ebuilds to use 'next_gcc'.
 USE_NEXT_GCC_PATCH = '230260'
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):
diff --git a/cros_utils b/cros_utils
deleted file mode 120000
index 66252432..00000000
--- a/cros_utils
+++ /dev/null
@@ -1 +0,0 @@
-utils
\ No newline at end of file
diff --git a/utils/__init__.py b/cros_utils/__init__.py
index 8b137891..8b137891 100644
--- a/utils/__init__.py
+++ b/cros_utils/__init__.py
diff --git a/utils/buildbot_json.py b/cros_utils/buildbot_json.py
index 693a42cd..693a42cd 100755
--- a/utils/buildbot_json.py
+++ b/cros_utils/buildbot_json.py
diff --git a/utils/buildbot_utils.py b/cros_utils/buildbot_utils.py
index a6366448..a80b7ad4 100644
--- a/utils/buildbot_utils.py
+++ b/cros_utils/buildbot_utils.py
@@ -9,9 +9,9 @@ import os
 import time
 import urllib2
 
-from utils import command_executer
-from utils import logger
-from utils import buildbot_json
+from cros_utils import command_executer
+from cros_utils import logger
+from cros_utils import buildbot_json
 
 SLEEP_TIME = 600  # 10 minutes; time between polling of buildbot.
 TIME_OUT = 18000  # Decide the build is dead or will never finish
@@ -117,7 +117,7 @@ def GetBuildInfo(file_dir, builder):
     file_dir is the toolchain_utils directory.
     """
   ce = command_executer.GetCommandExecuter()
-  commands = ('{0}/utils/buildbot_json.py builds '
+  commands = ('{0}/cros_utils/buildbot_json.py builds '
               'http://chromegw/i/tryserver.chromiumos/'.format(file_dir))
 
   if builder:
diff --git a/utils/colortrans.py b/cros_utils/colortrans.py
index 9458cc49..9458cc49 100644
--- a/utils/colortrans.py
+++ b/cros_utils/colortrans.py
diff --git a/utils/command_executer.py b/cros_utils/command_executer.py
index c5614513..c5614513 100644
--- a/utils/command_executer.py
+++ b/cros_utils/command_executer.py
diff --git a/utils/command_executer_unittest.py b/cros_utils/command_executer_unittest.py
index d5f5d0cf..d5f5d0cf 100755
--- a/utils/command_executer_unittest.py
+++ b/cros_utils/command_executer_unittest.py
diff --git a/utils/constants.py b/cros_utils/constants.py
index 827e9233..827e9233 100644
--- a/utils/constants.py
+++ b/cros_utils/constants.py
diff --git a/utils/email_sender.py b/cros_utils/email_sender.py
index f1d26c0c..cd45b4ec 100755
--- a/utils/email_sender.py
+++ b/cros_utils/email_sender.py
@@ -13,7 +13,7 @@ import os
 import smtplib
 import tempfile
 
-from utils import command_executer
+from cros_utils import command_executer
 
 
 class EmailSender(object):
diff --git a/utils/file_utils.py b/cros_utils/file_utils.py
index b7aad7b3..b7aad7b3 100644
--- a/utils/file_utils.py
+++ b/cros_utils/file_utils.py
diff --git a/utils/html_tools.py b/cros_utils/html_tools.py
index 8ca795bf..8ca795bf 100644
--- a/utils/html_tools.py
+++ b/cros_utils/html_tools.py
diff --git a/utils/locks.py b/cros_utils/locks.py
index cb96368e..cb96368e 100644
--- a/utils/locks.py
+++ b/cros_utils/locks.py
diff --git a/utils/logger.py b/cros_utils/logger.py
index 364d9c9d..364d9c9d 100644
--- a/utils/logger.py
+++ b/cros_utils/logger.py
diff --git a/utils/machines.py b/cros_utils/machines.py
index ef856dd1..722df3b8 100644
--- a/utils/machines.py
+++ b/cros_utils/machines.py
@@ -5,7 +5,7 @@
 
 from __future__ import print_function
 
-from utils import command_executer
+from cros_utils import command_executer
 
 
 def MachineIsPingable(machine, logging_level='average'):
diff --git a/utils/manifest_versions.py b/cros_utils/manifest_versions.py
index f011282b..f011282b 100644
--- a/utils/manifest_versions.py
+++ b/cros_utils/manifest_versions.py
diff --git a/utils/misc.py b/cros_utils/misc.py
index ae234fe3..ae234fe3 100644
--- a/utils/misc.py
+++ b/cros_utils/misc.py
diff --git a/utils/misc_test.py b/cros_utils/misc_test.py
index 80082207..80082207 100644
--- a/utils/misc_test.py
+++ b/cros_utils/misc_test.py
diff --git a/utils/no_pseudo_terminal_test.py b/cros_utils/no_pseudo_terminal_test.py
index 94dba389..43eabb13 100644
--- a/utils/no_pseudo_terminal_test.py
+++ b/cros_utils/no_pseudo_terminal_test.py
@@ -7,7 +7,7 @@ import subprocess
 import tempfile
 import time
 import unittest
-from utils import command_executer
+from cros_utils import command_executer
 
 
 class NoPsuedoTerminalTest(unittest.TestCase):
diff --git a/utils/perf_diff.py b/cros_utils/perf_diff.py
index c861f6ba..c861f6ba 100755
--- a/utils/perf_diff.py
+++ b/cros_utils/perf_diff.py
diff --git a/utils/pstat.py b/cros_utils/pstat.py
index 602fc0c7..602fc0c7 100644
--- a/utils/pstat.py
+++ b/cros_utils/pstat.py
diff --git a/utils/stats.py b/cros_utils/stats.py
index 0387a076..0387a076 100644
--- a/utils/stats.py
+++ b/cros_utils/stats.py
diff --git a/utils/tabulator.py b/cros_utils/tabulator.py
index b7da0398..2c26ccad 100644
--- a/utils/tabulator.py
+++ b/cros_utils/tabulator.py
@@ -8,7 +8,7 @@ tables.
 
 Example usage:
 
-  from utils import tabulator
+  from cros_utils import tabulator
 
   data = [["benchmark1", "33", "44"],["benchmark2", "44", "33"]]
   tabulator.GetSimpleTable(data)
@@ -20,7 +20,7 @@ columns with custom result computation and coloring, and will compare values in
 each row according to taht scheme. Here is a complex example on printing a
 table:
 
-  from utils import tabulator
+  from cros_utils import tabulator
 
   runs = [[{"k1": "10", "k2": "12", "k5": "40", "k6": "40",
             "ms_1": "20", "k7": "FAIL", "k8": "PASS", "k9": "PASS",
diff --git a/utils/tabulator_test.py b/cros_utils/tabulator_test.py
index 21cd1e73..21cd1e73 100644
--- a/utils/tabulator_test.py
+++ b/cros_utils/tabulator_test.py
diff --git a/utils/timeline.py b/cros_utils/timeline.py
index 873aaa30..873aaa30 100644
--- a/utils/timeline.py
+++ b/cros_utils/timeline.py
diff --git a/utils/timeline_test.py b/cros_utils/timeline_test.py
index c93a1274..c93a1274 100644
--- a/utils/timeline_test.py
+++ b/cros_utils/timeline_test.py
diff --git a/crosperf/crosperf.py b/crosperf/crosperf.py
index e874277b..4c13c02b 100755
--- a/crosperf/crosperf.py
+++ b/crosperf/crosperf.py
@@ -16,10 +16,10 @@ from experiment_factory import ExperimentFactory
 from experiment_file import ExperimentFile
 from settings_factory import GlobalSettings
 
-# This import causes pylint to warn about "No name 'logger' in module 'utils'".
-# I do not understand why. The import works fine in python.
+# This import causes pylint to warn about "No name 'logger' in module
+# 'cros_utils'". I do not understand why. The import works fine in python.
 # pylint: disable=no-name-in-module
-from utils import logger
+from cros_utils import logger
 
 import test_flag
 
diff --git a/crosperf/download_images.py b/crosperf/download_images.py
index 7079d074..1b971892 100644
--- a/crosperf/download_images.py
+++ b/crosperf/download_images.py
@@ -7,7 +7,7 @@ import os
 
 import test_flag
 
-from utils import command_executer
+from cros_utils import command_executer
 
 
 class MissingImage(Exception):
diff --git a/cwp/interpreter/symbolizer.py b/cwp/interpreter/symbolizer.py
index 902e319d..4ece480d 100644
--- a/cwp/interpreter/symbolizer.py
+++ b/cwp/interpreter/symbolizer.py
@@ -6,7 +6,7 @@ import shutil
 from subprocess import call
 from subprocess import PIPE
 from subprocess import Popen
-from utils import misc
+from cros_utils import misc
 
 GSUTIL_CMD = 'gsutil cp gs://chromeos-image-archive/%s-release/%s/debug.tgz %s'
 TAR_CMD = 'tar -zxvf %s -C %s'
diff --git a/dejagnu/gdb_dejagnu.py b/dejagnu/gdb_dejagnu.py
index 1192fc0b..b6dcd6ac 100755
--- a/dejagnu/gdb_dejagnu.py
+++ b/dejagnu/gdb_dejagnu.py
@@ -14,9 +14,9 @@ import sys
 import tempfile
 import time
 
-from utils import command_executer
-from utils import logger
-from utils import misc
+from cros_utils import command_executer
+from cros_utils import logger
+from cros_utils import misc
 
 from run_dejagnu import TryAcquireMachine
 
diff --git a/dejagnu/run_dejagnu.py b/dejagnu/run_dejagnu.py
index 1aea31a7..b0f52c1c 100755
--- a/dejagnu/run_dejagnu.py
+++ b/dejagnu/run_dejagnu.py
@@ -18,10 +18,10 @@ import time
 
 import lock_machine
 import tc_enter_chroot
-from utils import command_executer
-from utils import constants
-from utils import logger
-from utils import misc
+from cros_utils import command_executer
+from cros_utils import constants
+from cros_utils import logger
+from cros_utils import misc
 
 
 def ProcessArguments(argv):
diff --git a/fdo_scripts/divide_and_merge_profiles.py b/fdo_scripts/divide_and_merge_profiles.py
index 390ad54a..99155852 100755
--- a/fdo_scripts/divide_and_merge_profiles.py
+++ b/fdo_scripts/divide_and_merge_profiles.py
@@ -14,8 +14,8 @@ import tempfile
 import build_chrome_browser
 import lock_machine
 import run_tests
-from utils import command_executer
-from utils import logger
+from cros_utils import command_executer
+from cros_utils import logger
 
 
 class ProfileMerger:
diff --git a/fdo_scripts/divide_and_merge_profiles_test.py b/fdo_scripts/divide_and_merge_profiles_test.py
index 29fd6e57..27141df3 100755
--- a/fdo_scripts/divide_and_merge_profiles_test.py
+++ b/fdo_scripts/divide_and_merge_profiles_test.py
@@ -10,8 +10,8 @@ import shutil
 import tempfile
 import unittest
 
-from utils import command_executer
-from utils import misc
+from cros_utils import command_executer
+from cros_utils import misc
 
 
 class DivideAndMergeProfilesTest(unittest.TestCase):
diff --git a/fdo_scripts/profile_cycler.py b/fdo_scripts/profile_cycler.py
index 0ffc1d90..738535f5 100755
--- a/fdo_scripts/profile_cycler.py
+++ b/fdo_scripts/profile_cycler.py
@@ -16,9 +16,9 @@ import build_chrome_browser
 import cros_login
 import lock_machine
 import run_tests
-from utils import command_executer
-from utils import logger
-from utils import misc
+from cros_utils import command_executer
+from cros_utils import logger
+from cros_utils import misc
 
 
 class CyclerProfiler:
diff --git a/fdo_scripts/summarize_hot_blocks.py b/fdo_scripts/summarize_hot_blocks.py
index e68d6747..6cf4164e 100644
--- a/fdo_scripts/summarize_hot_blocks.py
+++ b/fdo_scripts/summarize_hot_blocks.py
@@ -46,7 +46,7 @@ import shutil
 import sys
 import tempfile
 
-from utils import command_executer
+from cros_utils import command_executer
 
 
 # Given a line, check if it has a block count and return it.
diff --git a/fdo_scripts/vanilla_vs_fdo.py b/fdo_scripts/vanilla_vs_fdo.py
index 8431293f..66e15ce2 100644
--- a/fdo_scripts/vanilla_vs_fdo.py
+++ b/fdo_scripts/vanilla_vs_fdo.py
@@ -8,9 +8,9 @@ import sys
 
 import image_chromeos
 import setup_chromeos
-from utils import command_executer
-from utils import misc
-from utils import logger
+from cros_utils import command_executer
+from cros_utils import misc
+from cros_utils import logger
 
 
 class Patcher(object):
diff --git a/mem_tests/mem_groups.py b/mem_tests/mem_groups.py
index 6de76914..e2fbf271 100755
--- a/mem_tests/mem_groups.py
+++ b/mem_tests/mem_groups.py
@@ -13,7 +13,7 @@ and groups[1], etc.
 """
 
 import argparse
-from utils import compute_total_diff
+from cros_utils import compute_total_diff
 from datetime import datetime
 
 pretty_print = True
diff --git a/mem_tests/total_mem_actual.py b/mem_tests/total_mem_actual.py
index 2e836e88..2d53bebe 100755
--- a/mem_tests/total_mem_actual.py
+++ b/mem_tests/total_mem_actual.py
@@ -10,7 +10,7 @@ application
 """
 
 import argparse
-from utils import compute_total_diff
+from cros_utils import compute_total_diff
 from datetime import datetime
 
 pretty_print = True
diff --git a/mem_tests/total_mem_sampled.py b/mem_tests/total_mem_sampled.py
index c7336473..77dd6817 100755
--- a/mem_tests/total_mem_sampled.py
+++ b/mem_tests/total_mem_sampled.py
@@ -9,7 +9,7 @@ time in seconds from a base time, amount of memory that has been sampled
 """
 
 import argparse
-from utils import compute_total_diff
+from cros_utils import compute_total_diff
 from datetime import datetime
 
 parser = argparse.ArgumentParser()
diff --git a/remote_gcc_build.py b/remote_gcc_build.py
index 2e010983..37285645 100755
--- a/remote_gcc_build.py
+++ b/remote_gcc_build.py
@@ -86,7 +86,7 @@ def FindBuildIdFromLog(description):
   #                              description yet
 
   file_dir = os.path.dirname(os.path.realpath(__file__))
-  commands = ('{0}/utils/buildbot_json.py builds '
+  commands = ('{0}/cros_utils/buildbot_json.py builds '
               'http://chromegw/p/tryserver.chromiumos/'.format(file_dir))
   ce = command_executer.GetCommandExecuter()
   _, buildinfo, _ = ce.RunCommandWOutput(commands, print_to_console=False)
diff --git a/repo_to_repo.py b/repo_to_repo.py
index b3658883..77820529 100755
--- a/repo_to_repo.py
+++ b/repo_to_repo.py
@@ -17,9 +17,9 @@ import sys
 import tempfile
 
 from automation.clients.helper import perforce
-from utils import command_executer
-from utils import logger
-from utils import misc
+from cros_utils import command_executer
+from cros_utils import logger
+from cros_utils import misc
 
 # pylint: disable=anomalous-backslash-in-string