diff options
| author | Luis Lozano <llozano@chromium.org> | 2016-02-18 16:34:38 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-02-19 04:22:51 +0000 |
| commit | c7ed2bca6f5dbf0cc6ee7cd1e7d30ea3119adbe8 (patch) | |
| tree | 732a78ea36b7a804b8249573f3407ca5f1ac7834 /crosperf/settings_unittest.py | |
| parent | 969432132589753e9ef630c38c83d8f9ae2eccde (diff) | |
| download | toolchain-utils-c7ed2bca6f5dbf0cc6ee7cd1e7d30ea3119adbe8.tar.gz | |
refactor and add some checks to image downloading code.
The nightly testing is failing in misterious ways while
downloading images for testing. I am adding a check for the
image after "gsutil cp" and, in the process, refactored
the code a little.
BUG=None
TEST=run_tests
Change-Id: I3e84ee9f2ea3b9b66cc96bf723bd1bcb94f26af7
Reviewed-on: https://chrome-internal-review.googlesource.com/248966
Commit-Ready: Luis Lozano <llozano@chromium.org>
Tested-by: Luis Lozano <llozano@chromium.org>
Reviewed-by: Han Shen <shenhan@google.com>
Diffstat (limited to 'crosperf/settings_unittest.py')
| -rwxr-xr-x | crosperf/settings_unittest.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/crosperf/settings_unittest.py b/crosperf/settings_unittest.py index e5ccfd46..ee863b80 100755 --- a/crosperf/settings_unittest.py +++ b/crosperf/settings_unittest.py @@ -174,7 +174,7 @@ class TestSettings(unittest.TestCase): @mock.patch.object(download_images, 'ImageDownloader') def test_get_xbuddy_path(self, mock_downloader, mock_run, mock_logger): - mock_run.return_value = [0, 'fake_xbuddy_translation'] + mock_run.return_value = 'fake_xbuddy_translation' mock_downloader.Run = mock_run board = 'lumpy' chromeos_root = '/tmp/chromeos' @@ -194,19 +194,14 @@ class TestSettings(unittest.TestCase): self.settings.GetXbuddyPath(official_str, board, chromeos_root, log_level) self.assertEqual(mock_run.call_count, 1) self.assertEqual(mock_run.call_args_list[0][0], - ('/tmp/chromeos', - 'remote/lumpy-release/R34-5417.0.0')) + ('/tmp/chromeos', 'remote/lumpy-release/R34-5417.0.0')) mock_run.reset_mock() self.settings.GetXbuddyPath(xbuddy_str, board, chromeos_root, log_level) self.assertEqual(mock_run.call_count, 1) - self.assertEqual(mock_run.call_args_list[0][0], - ('/tmp/chromeos', - 'remote/lumpy/latest-dev')) + self.assertEqual(mock_run.call_args_list[0][0], ('/tmp/chromeos', + 'remote/lumpy/latest-dev')) - mock_run.return_value = [1, 'fake_xbuddy_translation'] - self.assertRaises(Exception, self.settings.GetXbuddyPath, xbuddy_str, board, - chromeos_root, log_level) if mock_logger: return |