| 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 elif test_suite_basename == 'cc_perftests': | 117 elif test_suite_basename == 'cc_perftests': |
| 118 return [ | 118 return [ |
| 119 'cc/test/data', | 119 'cc/test/data', |
| 120 ] | 120 ] |
| 121 elif test_suite_basename == 'perf_tests': | 121 elif test_suite_basename == 'perf_tests': |
| 122 return [ | 122 return [ |
| 123 'base/test/data', | 123 'base/test/data', |
| 124 ] | 124 ] |
| 125 elif test_suite_basename == 'content_browsertests': | 125 elif test_suite_basename == 'content_browsertests': |
| 126 return [ | 126 return [ |
| 127 'content/test/data/accessibility', |
| 128 ] |
| 129 |
| 130 return [ |
| 127 'content/test/data/content-disposition-inline.html', | 131 'content/test/data/content-disposition-inline.html', |
| 128 'content/test/data/title1.html', | 132 'content/test/data/title1.html', |
| 129 'content/test/data/post_message2.html', | 133 'content/test/data/post_message2.html', |
| 130 'content/test/data/content-sniffer-test0.html.mock-http-headers', | 134 'content/test/data/content-sniffer-test0.html.mock-http-headers', |
| 131 'content/test/data/content-sniffer-test1.html.mock-http-headers', | 135 'content/test/data/content-sniffer-test1.html.mock-http-headers', |
| 132 'content/test/data/speech', | 136 'content/test/data/speech', |
| 133 'content/test/data/page404.html.mock-http-headers', | 137 'content/test/data/page404.html.mock-http-headers', |
| 134 'content/test/data/content-sniffer-test3.html', | 138 'content/test/data/content-sniffer-test3.html', |
| 135 'content/test/data/post_message.html', | 139 'content/test/data/post_message.html', |
| 136 'content/test/data/remove_frame_on_unload.html', | 140 'content/test/data/remove_frame_on_unload.html', |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 self.LaunchChromeTestServerSpawner() | 384 self.LaunchChromeTestServerSpawner() |
| 381 self.tool.SetupEnvironment() | 385 self.tool.SetupEnvironment() |
| 382 | 386 |
| 383 #override | 387 #override |
| 384 def TearDown(self): | 388 def TearDown(self): |
| 385 """Cleans up the test enviroment for the test suite.""" | 389 """Cleans up the test enviroment for the test suite.""" |
| 386 self.tool.CleanUpEnvironment() | 390 self.tool.CleanUpEnvironment() |
| 387 if self._cleanup_test_files: | 391 if self._cleanup_test_files: |
| 388 self.adb.RemovePushedFiles() | 392 self.adb.RemovePushedFiles() |
| 389 super(TestRunner, self).TearDown() | 393 super(TestRunner, self).TearDown() |
| OLD | NEW |