commit 35b6e8dd2ce0da05e0585aa89c84d3978504a377
author George Engelbrecht <engeg@google.com> Fri Jun 18 09:43:28 2021 -0600
committer Commit Bot <commit-bot@chromium.org> Fri Jul 02 22:02:37 2021 +0000
tree 1ce59646a531ff322e104cd420be33ee00ca7911
parent 8cb9a2d74b75b3e74a9a0a7c753bd7a8a54ac204

trivial: fix up imports and move a test

BUG=b:185593007
TEST=./run_tests

Change-Id: Ib49b327dfd3e41b720c9cce6573f4f3f91bc724a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2972280
Tested-by: George Engelbrecht <engeg@google.com>
Auto-Submit: George Engelbrecht <engeg@google.com>
Reviewed-by: Alex Klein <saklein@chromium.org>
Commit-Queue: George Engelbrecht <engeg@google.com>

api/controller/controller_util.py

diff --git a/api/controller/controller_util.py b/api/controller/controller_util.py
index c86dd85..341f5d2 100644
--- a/api/controller/controller_util.py
+++ b/api/controller/controller_util.py
@@ -10,8 +10,8 @@
 from chromite.lib import build_target_lib
 from chromite.lib import constants
 from chromite.lib.parser import package_info
-from chromite.lib.chroot_lib import Chroot
-from chromite.lib.sysroot_lib import Sysroot
+from chromite.lib import chroot_lib
+from chromite.lib import sysroot_lib
 
 class Error(Exception):
   """Base error class for the module."""
@@ -53,7 +53,7 @@
   if features:
     env['FEATURES'] = ' '.join(features)
 
-  chroot = Chroot(
+  chroot = chroot_lib.Chroot(
       path=path, cache_dir=cache_dir, chrome_root=chrome_root, env=env)
 
   return chroot
@@ -73,7 +73,7 @@
   """
   assert isinstance(sysroot_message, sysroot_pb2.Sysroot)
 
-  return Sysroot(sysroot_message.path)
+  return sysroot_lib.Sysroot(sysroot_message.path)
 
 
 def ParseGomaConfig(goma_message, chroot_path):