| 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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 if not os.path.exists(d): | 190 if not os.path.exists(d): |
| 191 raise Exception('Page cycler data not found.') | 191 raise Exception('Page cycler data not found.') |
| 192 return data | 192 return data |
| 193 elif self.test_package.test_suite_basename == 'webkit_unit_tests': | 193 elif self.test_package.test_suite_basename == 'webkit_unit_tests': |
| 194 return [ | 194 return [ |
| 195 'third_party/WebKit/Source/WebKit/chromium/tests/data', | 195 'third_party/WebKit/Source/WebKit/chromium/tests/data', |
| 196 # We need the chrome/ directory to convice webkit_support:: | 196 # We need the chrome/ directory to convice webkit_support:: |
| 197 # GetWebKitRootDirFilePath() we're in a chrome working dir. | 197 # GetWebKitRootDirFilePath() we're in a chrome working dir. |
| 198 'chrome/VERSION', | 198 'chrome/VERSION', |
| 199 ] | 199 ] |
| 200 elif self.test_package.test_suite_basename == 'content_unittests': |
| 201 return [ |
| 202 'webkit/data/dom_storage/webcore_test_database.localstorage', |
| 203 ] |
| 200 return [] | 204 return [] |
| 201 | 205 |
| 202 def LaunchHelperToolsForTestSuite(self): | 206 def LaunchHelperToolsForTestSuite(self): |
| 203 """Launches helper tools for the test suite. | 207 """Launches helper tools for the test suite. |
| 204 | 208 |
| 205 Sometimes one test may need to run some helper tools first in order to | 209 Sometimes one test may need to run some helper tools first in order to |
| 206 successfully complete the test. | 210 successfully complete the test. |
| 207 """ | 211 """ |
| 208 document_root = self._GetHttpServerDocumentRootForTestSuite() | 212 document_root = self._GetHttpServerDocumentRootForTestSuite() |
| 209 if document_root: | 213 if document_root: |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 304 def TearDown(self): | 308 def TearDown(self): |
| 305 """Cleans up the test enviroment for the test suite.""" | 309 """Cleans up the test enviroment for the test suite.""" |
| 306 self.test_package.tool.CleanUpEnvironment() | 310 self.test_package.tool.CleanUpEnvironment() |
| 307 if self.test_package.cleanup_test_files: | 311 if self.test_package.cleanup_test_files: |
| 308 self.adb.RemovePushedFiles() | 312 self.adb.RemovePushedFiles() |
| 309 if self.dump_debug_info: | 313 if self.dump_debug_info: |
| 310 self.dump_debug_info.StopRecordingLog() | 314 self.dump_debug_info.StopRecordingLog() |
| 311 if self.test_package.performance_test: | 315 if self.test_package.performance_test: |
| 312 self.adb.TearDownPerformanceTest() | 316 self.adb.TearDownPerformanceTest() |
| 313 super(SingleTestRunner, self).TearDown() | 317 super(SingleTestRunner, self).TearDown() |
| OLD | NEW |