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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 return [ | 85 return [ |
86 'chrome/test/data/animate1.gif', | 86 'chrome/test/data/animate1.gif', |
87 'chrome/test/data/simple.html', | 87 'chrome/test/data/simple.html', |
88 'net/data/cache_tests', | 88 'net/data/cache_tests', |
89 'net/data/filter_unittests', | 89 'net/data/filter_unittests', |
90 'net/data/ftp', | 90 'net/data/ftp', |
91 'net/data/proxy_resolver_v8_tracing_unittest', | 91 'net/data/proxy_resolver_v8_tracing_unittest', |
92 'net/data/proxy_resolver_v8_unittest', | 92 'net/data/proxy_resolver_v8_unittest', |
93 'net/data/proxy_script_fetcher_unittest', | 93 'net/data/proxy_script_fetcher_unittest', |
94 'net/data/ssl/certificates', | 94 'net/data/ssl/certificates', |
| 95 'net/data/test.html', |
95 'net/data/url_request_unittest/', | 96 'net/data/url_request_unittest/', |
96 ] | 97 ] |
97 elif test_suite_basename == 'ui_tests': | 98 elif test_suite_basename == 'ui_tests': |
98 return [ | 99 return [ |
99 'chrome/test/data/dromaeo', | 100 'chrome/test/data/dromaeo', |
100 'chrome/test/data/json2.js', | 101 'chrome/test/data/json2.js', |
101 'chrome/test/data/sunspider', | 102 'chrome/test/data/sunspider', |
102 ] | 103 ] |
103 elif test_suite_basename == 'ui_unittests': | 104 elif test_suite_basename == 'ui_unittests': |
104 return [ | 105 return [ |
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 self.LaunchChromeTestServerSpawner() | 378 self.LaunchChromeTestServerSpawner() |
378 self.tool.SetupEnvironment() | 379 self.tool.SetupEnvironment() |
379 | 380 |
380 #override | 381 #override |
381 def TearDown(self): | 382 def TearDown(self): |
382 """Cleans up the test enviroment for the test suite.""" | 383 """Cleans up the test enviroment for the test suite.""" |
383 self.tool.CleanUpEnvironment() | 384 self.tool.CleanUpEnvironment() |
384 if self._cleanup_test_files: | 385 if self._cleanup_test_files: |
385 self.adb.RemovePushedFiles() | 386 self.adb.RemovePushedFiles() |
386 super(TestRunner, self).TearDown() | 387 super(TestRunner, self).TearDown() |
OLD | NEW |