Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Side by Side Diff: build/android/pylib/gtest/test_runner.py

Issue 13884012: Android: Push content/test/data/media for content_browsertests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 'content/test/data/browser_plugin_dragging.html', 184 'content/test/data/browser_plugin_dragging.html',
185 'content/test/data/fileapi', 185 'content/test/data/fileapi',
186 'content/test/data/npapi', 186 'content/test/data/npapi',
187 'content/test/data/nosniff-test.html.mock-http-headers', 187 'content/test/data/nosniff-test.html.mock-http-headers',
188 'content/test/data/accessibility', 188 'content/test/data/accessibility',
189 'content/test/data/dynamic1.html', 189 'content/test/data/dynamic1.html',
190 'content/test/data/browser_plugin_focus_child.html', 190 'content/test/data/browser_plugin_focus_child.html',
191 'content/test/data/rwhv_compositing_animation.html', 191 'content/test/data/rwhv_compositing_animation.html',
192 'content/test/data/click-noreferrer-links.html', 192 'content/test/data/click-noreferrer-links.html',
193 'content/test/data/browser_plugin_focus.html', 193 'content/test/data/browser_plugin_focus.html',
194 'content/test/data/media',
194 ] 195 ]
195 return [] 196 return []
196 197
197 198
198 def _GetOptionalDataFilesForTestSuite(test_suite_basename): 199 def _GetOptionalDataFilesForTestSuite(test_suite_basename):
199 """Returns a list of data files/dirs that are pushed if present. 200 """Returns a list of data files/dirs that are pushed if present.
200 201
201 Args: 202 Args:
202 test_suite_basename: The test suite basename for which to return file paths. 203 test_suite_basename: The test suite basename for which to return file paths.
203 204
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 self.LaunchChromeTestServerSpawner() 381 self.LaunchChromeTestServerSpawner()
381 self.tool.SetupEnvironment() 382 self.tool.SetupEnvironment()
382 383
383 #override 384 #override
384 def TearDown(self): 385 def TearDown(self):
385 """Cleans up the test enviroment for the test suite.""" 386 """Cleans up the test enviroment for the test suite."""
386 self.tool.CleanUpEnvironment() 387 self.tool.CleanUpEnvironment()
387 if self._cleanup_test_files: 388 if self._cleanup_test_files:
388 self.adb.RemovePushedFiles() 389 self.adb.RemovePushedFiles()
389 super(TestRunner, self).TearDown() 390 super(TestRunner, self).TearDown()
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698