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 glob | 5 import glob |
6 import logging | 6 import logging |
7 import os | 7 import os |
8 | 8 |
9 from pylib import android_commands | 9 from pylib import android_commands |
10 from pylib import constants | 10 from pylib import constants |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 'chrome/test/data/json2.js', | 101 'chrome/test/data/json2.js', |
102 'chrome/test/data/sunspider', | 102 'chrome/test/data/sunspider', |
103 ] | 103 ] |
104 elif test_suite_basename == 'ui_unittests': | 104 elif test_suite_basename == 'ui_unittests': |
105 return [ | 105 return [ |
106 'ui/base/test/data/data_pack_unittest/truncated-header.pak', | 106 'ui/base/test/data/data_pack_unittest/truncated-header.pak', |
107 ] | 107 ] |
108 elif test_suite_basename == 'content_unittests': | 108 elif test_suite_basename == 'content_unittests': |
109 return [ | 109 return [ |
110 'content/test/data/gpu/webgl_conformance_test_expectations.txt', | 110 'content/test/data/gpu/webgl_conformance_test_expectations.txt', |
| 111 'content/test/data/page_state/', |
111 'net/data/ssl/certificates/', | 112 'net/data/ssl/certificates/', |
112 'third_party/hyphen/hyph_en_US.dic', | 113 'third_party/hyphen/hyph_en_US.dic', |
113 'webkit/data/dom_storage/webcore_test_database.localstorage', | 114 'webkit/data/dom_storage/webcore_test_database.localstorage', |
114 ] | 115 ] |
115 elif test_suite_basename == 'cc_perftests': | 116 elif test_suite_basename == 'cc_perftests': |
116 return [ | 117 return [ |
117 'cc/test/data', | 118 'cc/test/data', |
118 ] | 119 ] |
119 elif test_suite_basename == 'perf_tests': | 120 elif test_suite_basename == 'perf_tests': |
120 return [ | 121 return [ |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
343 self.LaunchChromeTestServerSpawner() | 344 self.LaunchChromeTestServerSpawner() |
344 self.tool.SetupEnvironment() | 345 self.tool.SetupEnvironment() |
345 | 346 |
346 #override | 347 #override |
347 def TearDown(self): | 348 def TearDown(self): |
348 """Cleans up the test enviroment for the test suite.""" | 349 """Cleans up the test enviroment for the test suite.""" |
349 self.tool.CleanUpEnvironment() | 350 self.tool.CleanUpEnvironment() |
350 if self._cleanup_test_files: | 351 if self._cleanup_test_files: |
351 self.adb.RemovePushedFiles() | 352 self.adb.RemovePushedFiles() |
352 super(TestRunner, self).TearDown() | 353 super(TestRunner, self).TearDown() |
OLD | NEW |