Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(220)

Side by Side Diff: tools/perf/fetch_benchmark_deps_unittest.py

Issue 1568103002: Update tools/perf to use cloud_storage from catapult. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix failing fetch_benchmark_deps unittest + rebase. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « tools/perf/fetch_benchmark_deps.py ('k') | tools/perf/profile_creators/__init__.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import os 5 import os
6 import sys 6 import sys
7 import unittest 7 import unittest
8 import StringIO 8 import StringIO
9 9
10 import mock # pylint: disable=import-error 10 import mock # pylint: disable=import-error
11 11
12 from core import path_util
12 import fetch_benchmark_deps 13 import fetch_benchmark_deps
13 14
14 15
15 def NormPaths(paths): 16 def NormPaths(paths):
16 return sorted([os.path.normcase(p) for p in paths.splitlines()]) 17 return sorted([os.path.normcase(p) for p in paths.splitlines()])
17 18
18 19
19 class FetchBenchmarkDepsUnittest(unittest.TestCase): 20 class FetchBenchmarkDepsUnittest(unittest.TestCase):
20 """The test guards fetch_benchmark_deps. 21 """The test guards fetch_benchmark_deps.
21 22
(...skipping 22 matching lines...) Expand all
44 sys.argv[1] = benchmark_name 45 sys.argv[1] = benchmark_name
45 output = StringIO.StringIO() 46 output = StringIO.StringIO()
46 with mock.patch('telemetry.wpr.archive_info.WprArchiveInfo' 47 with mock.patch('telemetry.wpr.archive_info.WprArchiveInfo'
47 '.DownloadArchivesIfNeeded') as mock_download: 48 '.DownloadArchivesIfNeeded') as mock_download:
48 with mock.patch('catapult_base.cloud_storage' 49 with mock.patch('catapult_base.cloud_storage'
49 '.GetFilesInDirectoryIfChanged') as mock_get: 50 '.GetFilesInDirectoryIfChanged') as mock_get:
50 mock_download.return_value = True 51 mock_download.return_value = True
51 mock_get.GetFilesInDirectoryIfChanged.return_value = True 52 mock_get.GetFilesInDirectoryIfChanged.return_value = True
52 fetch_benchmark_deps.main(output) 53 fetch_benchmark_deps.main(output)
53 for f in output.getvalue().splitlines(): 54 for f in output.getvalue().splitlines():
54 fullpath = os.path.join(fetch_benchmark_deps.GetChromiumDir(), f) 55 fullpath = os.path.join(path_util.GetChromiumSrcDir(), f)
55 sha1path = fullpath + '.sha1' 56 sha1path = fullpath + '.sha1'
56 self.assertTrue(os.path.isfile(sha1path)) 57 self.assertTrue(os.path.isfile(sha1path))
57 if expected_fetched_file_paths: 58 if expected_fetched_file_paths:
58 self.assertEquals(expected_fetched_file_paths, 59 self.assertEquals(expected_fetched_file_paths,
59 NormPaths(output.getvalue())) 60 NormPaths(output.getvalue()))
60 61
61 def testFetchWPRs(self): 62 def testFetchWPRs(self):
62 self._RunFetchBenchmarkDepsTest('smoothness.top_25_smooth') 63 self._RunFetchBenchmarkDepsTest('smoothness.top_25_smooth')
63 64
64 def testFetchServingDirs(self): 65 def testFetchServingDirs(self):
65 self._RunFetchBenchmarkDepsTest('media.tough_video_cases') 66 self._RunFetchBenchmarkDepsTest('media.tough_video_cases')
66 67
67 def testFetchOctane(self): 68 def testFetchOctane(self):
68 octane_wpr_path = os.path.join( 69 octane_wpr_path = os.path.join(
69 os.path.dirname(__file__), 'page_sets', 'data', 'octane_001.wpr') 70 os.path.dirname(__file__), 'page_sets', 'data', 'octane_001.wpr')
70 expected = os.path.relpath(octane_wpr_path, 71 expected = os.path.relpath(octane_wpr_path,
71 fetch_benchmark_deps.GetChromiumDir()) 72 path_util.GetChromiumSrcDir())
72 self._RunFetchBenchmarkDepsTest('octane', NormPaths(expected)) 73 self._RunFetchBenchmarkDepsTest('octane', NormPaths(expected))
OLDNEW
« no previous file with comments | « tools/perf/fetch_benchmark_deps.py ('k') | tools/perf/profile_creators/__init__.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698