diff options
| author | George Brighton <george@gebn.co.uk> | 2015-06-27 20:14:15 +0100 |
|---|---|---|
| committer | George Brighton <george@gebn.co.uk> | 2015-06-27 20:16:53 +0100 |
| commit | a8e6f30d8ed13209f2e9815ae97b3edccd38561b (patch) | |
| tree | 0bc03248cd0f48d236056f0614c55be4d2f5f69e /youtube_dl | |
| parent | 9c494108983c2a951780217014c26d8f3b081682 (diff) | |
| download | youtube-dl-a8e6f30d8ed13209f2e9815ae97b3edccd38561b.tar.xz | |
[moviefap] Swap and justify tests
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/moviefap.py | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/youtube_dl/extractor/moviefap.py b/youtube_dl/extractor/moviefap.py index 6b79183c7..1985c53c0 100644 --- a/youtube_dl/extractor/moviefap.py +++ b/youtube_dl/extractor/moviefap.py @@ -9,19 +9,7 @@ from ..utils import str_to_int class MovieFapIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?moviefap\.com/videos/(?P<id>[0-9a-f]+)/(?P<name>[a-z-_]+)' _TESTS = [{ - 'url': 'http://www.moviefap.com/videos/e5da0d3edce5404418f5/jeune-couple-russe.html', - 'md5': 'fa56683e291fc80635907168a743c9ad', - 'info_dict': { - 'id': 'e5da0d3edce5404418f5', - 'ext': 'flv', - 'title': 'Jeune Couple Russe', - 'description': 'Amateur', - 'thumbnail': 'http://pic.moviefap.com/thumbs/e5/949-18l.jpg', - 'uploader_id': 'whiskeyjar', - 'display_id': 'jeune-couple-russe', - 'categories': ['Amateur', 'Teen'] - } - }, { + # normal, multi-format video 'url': 'http://www.moviefap.com/videos/be9867c9416c19f54a4a/experienced-milf-amazing-handjob.html', 'md5': '26624b4e2523051b550067d547615906', 'info_dict': { @@ -34,6 +22,20 @@ class MovieFapIE(InfoExtractor): 'display_id': 'experienced-milf-amazing-handjob', 'categories': ['Amateur', 'Masturbation', 'Mature', 'Flashing'] } + }, { + # quirky single-format case where the extension is given as fid, but the video is really an flv + 'url': 'http://www.moviefap.com/videos/e5da0d3edce5404418f5/jeune-couple-russe.html', + 'md5': 'fa56683e291fc80635907168a743c9ad', + 'info_dict': { + 'id': 'e5da0d3edce5404418f5', + 'ext': 'flv', + 'title': 'Jeune Couple Russe', + 'description': 'Amateur', + 'thumbnail': 'http://pic.moviefap.com/thumbs/e5/949-18l.jpg', + 'uploader_id': 'whiskeyjar', + 'display_id': 'jeune-couple-russe', + 'categories': ['Amateur', 'Teen'] + } }] @staticmethod |