diff options
| author | Bob Haarman <inglorion@chromium.org> | 2024-01-24 23:36:51 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2024-01-25 00:04:04 +0000 |
| commit | da46b24088738464c772eb9b5c00ca80ac91bd1d (patch) | |
| tree | 273e4a07d168bee98449525b20221a320558a8a6 | |
| parent | e6052e7dda4f2d13a32cc88747b8cf8350656410 (diff) | |
| download | toolchain-utils-da46b24088738464c772eb9b5c00ca80ac91bd1d.tar.gz | |
rust_uprev_test: stop importing RustVersion
cros lint does not like us to import rust_uprev.RustVersion and wants
us to import only rust_uprev. This change does that.
BUG=None
TEST=presubmit
Change-Id: I8b1b26113b673acdc4c153b9ce0221abf1330f8d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/5233608
Reviewed-by: George Burgess <gbiv@chromium.org>
Commit-Queue: Bob Haarman <inglorion@chromium.org>
Tested-by: Bob Haarman <inglorion@chromium.org>
| -rwxr-xr-x | rust_tools/rust_uprev_test.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/rust_tools/rust_uprev_test.py b/rust_tools/rust_uprev_test.py index 9604344a..f93c18fd 100755 --- a/rust_tools/rust_uprev_test.py +++ b/rust_tools/rust_uprev_test.py @@ -22,8 +22,6 @@ from llvm_tools import git with mock.patch("subprocess.check_output", return_value="/fake/chromiumos"): import rust_uprev -from rust_uprev import RustVersion - def _fail_command(cmd, *_args, **_kwargs): err = subprocess.CalledProcessError(returncode=1, cmd=cmd) @@ -498,7 +496,7 @@ class PrepareUprevTest(unittest.TestCase): @mock.patch.object( rust_uprev, "get_rust_bootstrap_version", - return_value=RustVersion(0, 41, 12), + return_value=rust_uprev.RustVersion(0, 41, 12), ) @mock.patch.object(rust_uprev, "get_command_output") def test_return_none_with_template_larger_than_input( @@ -903,7 +901,7 @@ class RustUprevOtherStagesTests(unittest.TestCase): mock_path = mock.Mock() mock_path.read_text.return_value = rust_ebuild mock_find_ebuild_path.return_value = mock_path - rust_uprev.build_cross_compiler(RustVersion(7, 3, 31)) + rust_uprev.build_cross_compiler(rust_uprev.RustVersion(7, 3, 31)) mock_run_in_chroot.assert_called_once_with( ["sudo", "emerge", "-j", "-G"] |