OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 logging | 5 import logging |
6 import os | 6 import os |
7 import sys | 7 import sys |
8 | 8 |
9 from base_test_runner import BaseTestRunner | 9 from base_test_runner import BaseTestRunner |
10 import debug_info | 10 import debug_info |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 """ | 208 """ |
209 document_root = self._GetHttpServerDocumentRootForTestSuite() | 209 document_root = self._GetHttpServerDocumentRootForTestSuite() |
210 if document_root: | 210 if document_root: |
211 self.LaunchTestHttpServer(document_root) | 211 self.LaunchTestHttpServer(document_root) |
212 if self._TestSuiteRequiresMockTestServer(): | 212 if self._TestSuiteRequiresMockTestServer(): |
213 self.LaunchChromeTestServerSpawner() | 213 self.LaunchChromeTestServerSpawner() |
214 | 214 |
215 def StripAndCopyFiles(self): | 215 def StripAndCopyFiles(self): |
216 """Strips and copies the required data files for the test suite.""" | 216 """Strips and copies the required data files for the test suite.""" |
217 self.test_package.StripAndCopyExecutable() | 217 self.test_package.StripAndCopyExecutable() |
| 218 self.test_package.PushDataAndPakFiles() |
218 self.test_package.tool.CopyFiles() | 219 self.test_package.tool.CopyFiles() |
219 test_data = self.GetDataFilesForTestSuite() | 220 test_data = self.GetDataFilesForTestSuite() |
220 if test_data and not self.fast_and_loose: | 221 if test_data and not self.fast_and_loose: |
221 if self.test_package.test_suite_basename == 'page_cycler_tests': | 222 if self.test_package.test_suite_basename == 'page_cycler_tests': |
222 # Since the test data for page cycler are huge (around 200M), we use | 223 # Since the test data for page cycler are huge (around 200M), we use |
223 # sdcard to store the data and create symbol links to map them to | 224 # sdcard to store the data and create symbol links to map them to |
224 # data/local/tmp/ later. | 225 # data/local/tmp/ later. |
225 self.CopyTestData(test_data, '/sdcard/') | 226 self.CopyTestData(test_data, '/sdcard/') |
226 for p in [os.path.dirname(d) for d in test_data if os.path.isdir(d)]: | 227 for p in [os.path.dirname(d) for d in test_data if os.path.isdir(d)]: |
227 mapped_device_path = '/data/local/tmp/' + p | 228 mapped_device_path = '/data/local/tmp/' + p |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
305 def TearDown(self): | 306 def TearDown(self): |
306 """Cleans up the test enviroment for the test suite.""" | 307 """Cleans up the test enviroment for the test suite.""" |
307 self.test_package.tool.CleanUpEnvironment() | 308 self.test_package.tool.CleanUpEnvironment() |
308 if self.test_package.cleanup_test_files: | 309 if self.test_package.cleanup_test_files: |
309 self.adb.RemovePushedFiles() | 310 self.adb.RemovePushedFiles() |
310 if self.dump_debug_info: | 311 if self.dump_debug_info: |
311 self.dump_debug_info.StopRecordingLog() | 312 self.dump_debug_info.StopRecordingLog() |
312 if self.test_package.performance_test: | 313 if self.test_package.performance_test: |
313 self.adb.TearDownPerformanceTest() | 314 self.adb.TearDownPerformanceTest() |
314 super(SingleTestRunner, self).TearDown() | 315 super(SingleTestRunner, self).TearDown() |
OLD | NEW |