summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo.valsorda@gmail.com>2013-10-14 18:25:52 -0400
committerFilippo Valsorda <filippo.valsorda@gmail.com>2013-11-25 17:46:33 -0500
commit00b350d209d5013a4302970a627a4ca10b0ed3a9 (patch)
treeb9a2b4cd59c7ff2bd26b5cfdc9f3662ea0ab3251
parentd8ec4959c824cba4c87af16ad0b25851560fcf57 (diff)
[test] tell Travis to install rtmpdump and add initial support to rtmp testingrtmp_test
-rw-r--r--.travis.yml3
-rw-r--r--youtube_dl/extractor/cinemassacre.py14
-rw-r--r--youtube_dl/extractor/videopremium.py6
3 files changed, 9 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml
index 45b71f11b6..64dfcbb7c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,9 @@ python:
- "2.6"
- "2.7"
- "3.3"
+before_install:
+ - sudo apt-get update -qq
+ - sudo apt-get install -qq rtmpdump
script: nosetests test --verbose
notifications:
email:
diff --git a/youtube_dl/extractor/cinemassacre.py b/youtube_dl/extractor/cinemassacre.py
index f0d08cebfc..1be11ef77b 100644
--- a/youtube_dl/extractor/cinemassacre.py
+++ b/youtube_dl/extractor/cinemassacre.py
@@ -12,27 +12,21 @@ class CinemassacreIE(InfoExtractor):
_TESTS = [{
u'url': u'http://cinemassacre.com/2012/11/10/avgn-the-movie-trailer/',
u'file': u'19911.flv',
+ u'md5': u'f9bb7ede54d1229c9846e197b4737e06',
u'info_dict': {
u'upload_date': u'20121110',
u'title': u'“Angry Video Game Nerd: The Movie” – Trailer',
u'description': u'md5:fb87405fcb42a331742a0dce2708560b',
- },
- u'params': {
- # rtmp download
- u'skip_download': True,
- },
+ }
},
{
u'url': u'http://cinemassacre.com/2013/10/02/the-mummys-hand-1940',
u'file': u'521be8ef82b16.flv',
+ u'md5': u'9509ee44dcaa7c1068604817c19a9e50',
u'info_dict': {
u'upload_date': u'20131002',
u'title': u'The Mummy’s Hand (1940)',
- },
- u'params': {
- # rtmp download
- u'skip_download': True,
- },
+ }
}]
def _real_extract(self, url):
diff --git a/youtube_dl/extractor/videopremium.py b/youtube_dl/extractor/videopremium.py
index 4800415bde..b9da817b07 100644
--- a/youtube_dl/extractor/videopremium.py
+++ b/youtube_dl/extractor/videopremium.py
@@ -9,12 +9,10 @@ class VideoPremiumIE(InfoExtractor):
_TEST = {
u'url': u'http://videopremium.tv/4w7oadjsf156',
u'file': u'4w7oadjsf156.f4v',
+ u'md5': u'e51e4a266aab7531c6ac06f4ffee3b0d',
u'info_dict': {
u"title": u"youtube-dl_test_video____a_________-BaW_jenozKc.mp4.mp4"
- },
- u'params': {
- u'skip_download': True,
- },
+ }
}
def _real_extract(self, url):