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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
115 elif test_suite_basename == 'cc_perftests': | 115 elif test_suite_basename == 'cc_perftests': |
116 return [ | 116 return [ |
117 'cc/test/data', | 117 'cc/test/data', |
118 ] | 118 ] |
119 elif test_suite_basename == 'perf_tests': | 119 elif test_suite_basename == 'perf_tests': |
120 return [ | 120 return [ |
121 'base/test/data', | 121 'base/test/data', |
122 ] | 122 ] |
123 elif test_suite_basename == 'content_browsertests': | 123 elif test_suite_basename == 'content_browsertests': |
124 return [ | 124 return [ |
125 'content/test/data/accessibility', | |
126 ] | |
127 | |
128 return [ | |
125 'content/test/data/content-disposition-inline.html', | 129 'content/test/data/content-disposition-inline.html', |
David Trainor- moved to gerrit
2013/06/04 20:27:18
What happened to these for content_browsertests?
dmazzoni
2013/06/07 20:23:16
Sorry, that was for my own testing. Reverted.
| |
126 'content/test/data/title1.html', | 130 'content/test/data/title1.html', |
127 'content/test/data/post_message2.html', | 131 'content/test/data/post_message2.html', |
128 'content/test/data/content-sniffer-test0.html.mock-http-headers', | 132 'content/test/data/content-sniffer-test0.html.mock-http-headers', |
129 'content/test/data/content-sniffer-test1.html.mock-http-headers', | 133 'content/test/data/content-sniffer-test1.html.mock-http-headers', |
130 'content/test/data/speech', | 134 'content/test/data/speech', |
131 'content/test/data/page404.html.mock-http-headers', | 135 'content/test/data/page404.html.mock-http-headers', |
132 'content/test/data/content-sniffer-test3.html', | 136 'content/test/data/content-sniffer-test3.html', |
133 'content/test/data/post_message.html', | 137 'content/test/data/post_message.html', |
134 'content/test/data/remove_frame_on_unload.html', | 138 'content/test/data/remove_frame_on_unload.html', |
135 'content/test/data/cross-origin-redirect-blocked.html', | 139 'content/test/data/cross-origin-redirect-blocked.html', |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
378 self.LaunchChromeTestServerSpawner() | 382 self.LaunchChromeTestServerSpawner() |
379 self.tool.SetupEnvironment() | 383 self.tool.SetupEnvironment() |
380 | 384 |
381 #override | 385 #override |
382 def TearDown(self): | 386 def TearDown(self): |
383 """Cleans up the test enviroment for the test suite.""" | 387 """Cleans up the test enviroment for the test suite.""" |
384 self.tool.CleanUpEnvironment() | 388 self.tool.CleanUpEnvironment() |
385 if self._cleanup_test_files: | 389 if self._cleanup_test_files: |
386 self.adb.RemovePushedFiles() | 390 self.adb.RemovePushedFiles() |
387 super(TestRunner, self).TearDown() | 391 super(TestRunner, self).TearDown() |
OLD | NEW |