diff options
| author | Zhizhou Yang <zhizhouy@google.com> | 2019-10-09 13:58:12 -0700 |
|---|---|---|
| committer | Zhizhou Yang <zhizhouy@google.com> | 2019-10-09 21:15:34 +0000 |
| commit | 823580252f352a2fb04abe3e89fa8710eeaff023 (patch) | |
| tree | c6fb85e375375cbca80abb79b1b115aef9752d6f | |
| parent | 22755b89b9ce84707c2ee065ee7d37beb28c5952 (diff) | |
| download | toolchain-utils-823580252f352a2fb04abe3e89fa8710eeaff023.tar.gz | |
crosperf: gsutil location changed
Most recently, the checkout location of depot_tools in chromeos has been
changed, which will break Crosperf at image downloading. This patch
fixes it.
BUG=chromium:1012904
TEST=Passed unittests.
Change-Id: I60b8de6aa3a34faa8be06aedc8ff169da993d5a5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1848858
Commit-Queue: Zhizhou Yang <zhizhouy@google.com>
Tested-by: Zhizhou Yang <zhizhouy@google.com>
Reviewed-by: Denis Nikitin <denik@chromium.org>
Reviewed-by: Tiancong Wang <tcwang@google.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
| -rw-r--r-- | crosperf/download_images.py | 2 | ||||
| -rwxr-xr-x | crosperf/download_images_unittest.py | 4 | ||||
| -rw-r--r-- | crosperf/suite_runner.py | 2 | ||||
| -rwxr-xr-x | crosperf/suite_runner_unittest.py | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/crosperf/download_images.py b/crosperf/download_images.py index 0eb9b8a1..e02c5817 100644 --- a/crosperf/download_images.py +++ b/crosperf/download_images.py @@ -14,7 +14,7 @@ import test_flag from cros_utils import command_executer -GS_UTIL = 'chromium/tools/depot_tools/gsutil.py' +GS_UTIL = 'src/chromium/depot_tools/gsutil.py' class MissingImage(Exception): diff --git a/crosperf/download_images_unittest.py b/crosperf/download_images_unittest.py index 8d9b9e72..68a84676 100755 --- a/crosperf/download_images_unittest.py +++ b/crosperf/download_images_unittest.py @@ -1,5 +1,5 @@ #!/usr/bin/env python2 -#-*- coding: utf-8 -*- +# -*- coding: utf-8 -*- # Copyright 2019 The Chromium OS Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -68,7 +68,7 @@ class ImageDownloaderTestcast(unittest.TestCase): # Verify we called RunCommand once, with proper arguments. self.assertEqual(mock_cmd_exec.RunCommand.call_count, 1) expected_args = ( - '/usr/local/home/chromeos/chromium/tools/depot_tools/gsutil.py ' + '/usr/local/home/chromeos/src/chromium/depot_tools/gsutil.py ' 'cp gs://chromeos-image-archive/lumpy-release/R36-5814.0.0/' 'chromiumos_test_image.tar.xz ' '/usr/local/home/chromeos/chroot/tmp/lumpy-release/R36-5814.0.0') diff --git a/crosperf/suite_runner.py b/crosperf/suite_runner.py index 43d5bca3..01e7114f 100644 --- a/crosperf/suite_runner.py +++ b/crosperf/suite_runner.py @@ -18,7 +18,7 @@ from cros_utils import command_executer TEST_THAT_PATH = '/usr/bin/test_that' # TODO: Need to check whether Skylab is installed and set up correctly. SKYLAB_PATH = '/usr/local/bin/skylab' -GS_UTIL = 'chromium/tools/depot_tools/gsutil.py' +GS_UTIL = 'src/chromium/depot_tools/gsutil.py' AUTOTEST_DIR = '~/trunk/src/third_party/autotest/files' CHROME_MOUNT_DIR = '/tmp/chrome_root' diff --git a/crosperf/suite_runner_unittest.py b/crosperf/suite_runner_unittest.py index 8b5b1f13..8b336eda 100755 --- a/crosperf/suite_runner_unittest.py +++ b/crosperf/suite_runner_unittest.py @@ -927,12 +927,12 @@ class SuiteRunnerTest(unittest.TestCase): self.assertEqual(mock_runcmd.call_count, 2) cmd = mock_runcmd.call_args_list[0][0][0] self.assertEqual(cmd, - ('/tmp/chromeos/chromium/tools/depot_tools/gsutil.py ls ' + ('/tmp/chromeos/src/chromium/depot_tools/gsutil.py ls ' 'gs://chromeos-autotest-results/swarming-12345/' 'autoserv_test')) cmd = mock_runcmd.call_args_list[1][0][0] self.assertEqual(cmd, - ('/tmp/chromeos/chromium/tools/depot_tools/gsutil.py -mq ' + ('/tmp/chromeos/src/chromium/depot_tools/gsutil.py -mq ' 'cp -r gs://chromeos-autotest-results/swarming-12345 ' '/tmp/chromeos/chroot/tmp')) |