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

Unified Diff: chrome/test/functional/media/media_basic_playback.py

Issue 10825038: Update basic_media_playback tests to use media files in content/test/data (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/data/media/html/media_basic_playback.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/functional/media/media_basic_playback.py
diff --git a/chrome/test/functional/media/media_basic_playback.py b/chrome/test/functional/media/media_basic_playback.py
index ed0f1a0f86d77bc9bf0d469ec76410317829f7b2..cedd567c82c935bd2847e7fee4727d2e386b81e5 100755
--- a/chrome/test/functional/media/media_basic_playback.py
+++ b/chrome/test/functional/media/media_basic_playback.py
@@ -22,8 +22,9 @@ _TEST_HTML_PATH = os.path.join('media', 'html', 'media_basic_playback.html')
# have more test videos in the matrix. Code already written, see patch here:
# https://chromiumcodereview.appspot.com/9290008/#ps12
_TEST_VIDEOS = [
- 'bear.mp4', 'bear.ogv', 'bear.webm', 'bear_silent.mp4', 'bear_silent.ogv',
- 'bear_silent.webm']
+ os.path.join(pyauto.PyUITest.ContentDataDir(), 'media', name)
DaleCurtis 2012/07/26 17:49:52 '/'.join() or posixpath() ? :)
shadi 2012/07/26 17:55:31 I believe os.path.join is what we need here since
+ for name in ['bear.mp4', 'bear.ogv', 'bear.webm', 'bear_silent.mp4',
+ 'bear_silent.ogv', 'bear_silent.webm']]
# Expected events for the first iteration and every iteration thereafter.
_EXPECTED_EVENTS_0 = [('ended', 2), ('playing', 2), ('seeked', 1)]
« no previous file with comments | « chrome/test/data/media/html/media_basic_playback.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698