commit a81f70532a3ff9786b5262aa458319190b740f7a
author Mike Frysinger <vapier@chromium.org> Fri Mar 01 14:55:33 2019 -0500
committer chrome-bot <chrome-bot@chromium.org> Fri Mar 01 23:41:28 2019 -0800
tree 758689fb59a201ee9130e2140022121af6581798
parent 8ea7f0b331f76ae0e535f0f0e6aa23a2ecae2acd

vm_au_worker: rework imported constants

Use "chromite_constants" for chromite.lib.constants like we do in
devinstall_test so we can keep "constants" reserved for our local
module.

BUG=None
TEST=precq passes

Change-Id: I62cdeed0ad595bca5f24d578b1bc7194d4393330
Reviewed-on: https://chromium-review.googlesource.com/1497251
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>

au_test_harness/vm_au_worker.py

diff --git a/au_test_harness/vm_au_worker.py b/au_test_harness/vm_au_worker.py
index c24b1b6..5666cae 100644
--- a/au_test_harness/vm_au_worker.py
+++ b/au_test_harness/vm_au_worker.py
@@ -12,9 +12,10 @@
 import tempfile
 
 from chromite.cbuildbot import constants as buildbot_constants
-from chromite.lib import constants
+from chromite.lib import constants as chromite_constants
 from chromite.lib import cros_build_lib
 from chromite.lib import cros_logging as logging
+from crostestutils.lib import constants
 from crostestutils.au_test_harness import au_worker
 from crostestutils.au_test_harness import update_exception
 
@@ -36,7 +37,7 @@
     cros_build_lib.RunCommand(['./cros_vm', '--stop',
                                '--ssh-port=%s' % self._ssh_port],
                               print_cmd=False, error_code_ok=True,
-                              cwd=constants.CHROMITE_BIN_DIR)
+                              cwd=chromite_constants.CHROMITE_BIN_DIR)
 
   def CleanUp(self):
     """Stop the vm after a test."""
@@ -81,7 +82,7 @@
 
   def _UpdateCmd(self, log_directory, stateful_change):
     """Update command to use."""
-    cmd = ['%s/cros_run_vm_test' % constants.CHROMITE_BIN_DIR,
+    cmd = ['%s/cros_run_vm_test' % chromite_constants.CHROMITE_BIN_DIR,
            '--board=%s' % self.board,
            '--image-path=%s' % self.vm_image_path,
            '--ssh-port=%s' % self._ssh_port,
@@ -173,7 +174,7 @@
 
     result = cros_build_lib.RunCommand(
         command, print_cmd=self.verbose, combine_stdout_stderr=True,
-        cwd=constants.CHROMITE_BIN_DIR, error_code_ok=True,
+        cwd=chromite_constants.CHROMITE_BIN_DIR, error_code_ok=True,
         capture_output=not self.verbose)
     # If the command failed or printed warnings, print the output.
     # TODO(pwang): result.output should contain the output of the command even