commit 7f76832f10f4bf0c83f6e2c1d2322c3ad5e80420
author Alex Klein <saklein@chromium.org> Wed Jan 18 15:34:01 2023 -0700
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jan 19 22:50:45 2023 +0000
tree aac3c7b35da41e23c763f29adc9e2458bfac2ce0
parent 8432294a070b3956b7e86d1f668b4a4e4bc82c25

api: controller_util_unittest: Standardize imports

Correct imports according to style guide.

BUG=None
TEST=./run_tests

Change-Id: I8882e66b6bbee6ec9363faa662ec14dd895c3ebb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4179352
Auto-Submit: Alex Klein <saklein@chromium.org>
Reviewed-by: Lizzy Presland <zland@google.com>
Tested-by: Alex Klein <saklein@chromium.org>
Commit-Queue: Lizzy Presland <zland@google.com>

api/controller/controller_util_unittest.py

diff --git a/api/controller/controller_util_unittest.py b/api/controller/controller_util_unittest.py
index 47642d4..085c510 100644
--- a/api/controller/controller_util_unittest.py
+++ b/api/controller/controller_util_unittest.py
@@ -9,10 +9,10 @@
 from chromite.api.gen.chromite.api import sysroot_pb2
 from chromite.api.gen.chromiumos import common_pb2
 from chromite.lib import build_target_lib
+from chromite.lib import chroot_lib
 from chromite.lib import cros_test_lib
-from chromite.lib.chroot_lib import Chroot
+from chromite.lib import sysroot_lib
 from chromite.lib.parser import package_info
-from chromite.lib.sysroot_lib import Sysroot
 
 
 class ParseChrootTest(cros_test_lib.MockTestCase):
@@ -38,7 +38,7 @@
             env={"use_flags": use_flags, "features": features},
         )
 
-        expected = Chroot(
+        expected = chroot_lib.Chroot(
             path=path,
             cache_dir=cache_dir,
             chrome_root=chrome_root,
@@ -61,7 +61,7 @@
         """test successful handling case."""
         path = "/build/rare_pokemon"
         sysroot_message = sysroot_pb2.Sysroot(path=path)
-        expected = Sysroot(path=path)
+        expected = sysroot_lib.Sysroot(path=path)
         result = controller_util.ParseSysroot(sysroot_message)
         self.assertEqual(expected, result)
 
@@ -222,7 +222,7 @@
         package_info.parse("foo/bar%d-1.0-r1" % num) for num in range(1, 4)
     ]
     output_proto = sysroot_pb2.InstallPackagesResponse()
-    target_sysroot = Sysroot(path="/path/to/sysroot")
+    target_sysroot = sysroot_lib.Sysroot(path="/path/to/sysroot")
     controller_util.retrieve_package_log_paths(
         packages, output_proto, target_sysroot
     )