X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=test%2Ftest_download.py;h=545afb922134ab11eaf4a80b02cf9ccfd15c7742;hb=6b5076122246f8b7b43bac232b1da9a8dbdc2411;hp=7de9f2a4897f6f77dbfd3db527bc91144bfe2e1a;hpb=4279a0ca983476a0bdf86e23251b866616cbd434;p=youtube-dl diff --git a/test/test_download.py b/test/test_download.py index 7de9f2a48..545afb922 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -6,9 +6,7 @@ import json from youtube_dl.FileDownloader import FileDownloader from youtube_dl.InfoExtractors import YoutubeIE, DailymotionIE -from youtube_dl.InfoExtractors import MetacafeIE, PhotobucketIE -from youtube_dl.InfoExtractors import FacebookIE, BlipTVIE -from youtube_dl.InfoExtractors import VimeoIE, XVideosIE +from youtube_dl.InfoExtractors import MetacafeIE, BlipTVIE class DownloadTest(unittest.TestCase): @@ -16,38 +14,21 @@ class DownloadTest(unittest.TestCase): #calculated with md5sum: #md5sum (GNU coreutils) 8.19 - YOUTUBE_MD5 = "ab62e120445e8f68e8c8fddb7bd3ed76" + YOUTUBE_SIZE = 1993883 YOUTUBE_URL = "http://www.youtube.com/watch?v=BaW_jenozKc" YOUTUBE_FILE = "BaW_jenozKc.mp4" - DAILYMOTION_MD5 = "d363a50e9eb4f22ce90d08d15695bb47" DAILYMOTION_URL = "http://www.dailymotion.com/video/x33vw9_tutoriel-de-youtubeur-dl-des-video_tech" DAILYMOTION_FILE = "x33vw9.mp4" + METACAFE_SIZE = 5754305 + METACAFE_URL = "http://www.metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/" + METACAFE_FILE = "_aUehQsCQtM.flv" - METACAFE_MD5 = "" - METACAFE_URL = "http://www.metacafe.com/watch/yt-bV9L5Ht9LgY/download_youtube_playlist_with_youtube_dl/" - METACAFE_FILE = "" - - - PHOTOBUCKET_MD5 = "" - PHOTOBUCKET_URL = "" - PHOTOBUCKET_FILE = "" - - - FACEBOOK_MD5 = "" - FACEBOOK_URL = "" - FACEBOOK_FILE = "" - - - BLIP_MD5 = "" - BLIP_URL = "" - BLIP_FILE = "" - - VIMEO_MD5 = "" - VIMEO_URL = "" - VIMEO_FILE = "" + BLIP_MD5 = "93c24d2f4e0782af13b8a7606ea97ba7" + BLIP_URL = "http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352" + BLIP_FILE = "5779306.m4v" XVIDEO_MD5 = "" XVIDEO_URL = "" @@ -60,10 +41,8 @@ class DownloadTest(unittest.TestCase): fd = FileDownloader(json.load(f)) fd.add_info_extractor(YoutubeIE()) fd.download([DownloadTest.YOUTUBE_URL]) - print(os.path.abspath(DownloadTest.YOUTUBE_FILE)) self.assertTrue(os.path.exists(DownloadTest.YOUTUBE_FILE)) - md5_down_file = md5_for_file(DownloadTest.YOUTUBE_FILE) - self.assertEqual(md5_down_file, DownloadTest.YOUTUBE_MD5) + self.assertEqual(os.path.getsize(DownloadTest.YOUTUBE_FILE), DownloadTest.YOUTUBE_SIZE) def test_dailymotion(self): with open(DownloadTest.PARAMETERS_FILE) as f: @@ -76,38 +55,15 @@ class DownloadTest(unittest.TestCase): def test_metacafe(self): #this emulate a skip,to be 2.6 compatible - return with open(DownloadTest.PARAMETERS_FILE) as f: fd = FileDownloader(json.load(f)) - print fd fd.add_info_extractor(MetacafeIE()) + fd.add_info_extractor(YoutubeIE()) fd.download([DownloadTest.METACAFE_URL]) self.assertTrue(os.path.exists(DownloadTest.METACAFE_FILE)) - md5_down_file = md5_for_file(DownloadTest.METACAFE_FILE) - self.assertEqual(md5_down_file, DownloadTest.METACAFE_MD5) - - def test_photobucket(self): - return - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) - fd.add_info_extractor(PhotobucketIE()) - fd.download([DownloadTest.PHOTOBUCKET_URL]) - self.assertTrue(os.path.exists(DownloadTest.PHOTOBUCKET_FILE)) - md5_down_file = md5_for_file(DownloadTest.PHOTOBUCKET_FILE) - self.assertEqual(md5_down_file, DownloadTest.PHOTOBUCKET_MD5) - - def test_facebook(self): - return - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) - fd.add_info_extractor(FacebookIE()) - fd.download([DownloadTest.FACEBOOK_URL]) - self.assertTrue(os.path.exists(DownloadTest.FACEBOOK_FILE)) - md5_down_file = md5_for_file(DownloadTest.FACEBOOK_FILE) - self.assertEqual(md5_down_file, DownloadTest.FACEBOOK_MD5) + self.assertEqual(os.path.getsize(DownloadTest.METACAFE_FILE), DownloadTest.METACAFE_SIZE) def test_blip(self): - return with open(DownloadTest.PARAMETERS_FILE) as f: fd = FileDownloader(json.load(f)) fd.add_info_extractor(BlipTVIE()) @@ -116,26 +72,6 @@ class DownloadTest(unittest.TestCase): md5_down_file = md5_for_file(DownloadTest.BLIP_FILE) self.assertEqual(md5_down_file, DownloadTest.BLIP_MD5) - def test_vimeo(self): - return - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) - fd.add_info_extractor(VimeoIE()) - fd.download([DownloadTest.VIMEO_URL]) - self.assertTrue(os.path.exists(DownloadTest.VIMEO_FILE)) - md5_down_file = md5_for_file(DownloadTest.VIMEO_FILE) - self.assertEqual(md5_down_file, DownloadTest.VIMEO_MD5) - - def test_xvideo(self): - return - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) - fd.add_info_extractor(XVideosIE()) - fd.download([DownloadTest.XVIDEO_URL]) - self.assertTrue(os.path.exists(DownloadTest.XVIDEO_FILE)) - md5_down_file = md5_for_file(DownloadTest.XVIDEO_FILE) - self.assertEqual(md5_down_file, DownloadTest.XVIDEO_MD5) - def tearDown(self): if os.path.exists(DownloadTest.YOUTUBE_FILE): os.remove(DownloadTest.YOUTUBE_FILE) @@ -143,16 +79,8 @@ class DownloadTest(unittest.TestCase): os.remove(DownloadTest.DAILYMOTION_FILE) if os.path.exists(DownloadTest.METACAFE_FILE): os.remove(DownloadTest.METACAFE_FILE) - if os.path.exists(DownloadTest.PHOTOBUCKET_FILE): - os.remove(DownloadTest.PHOTOBUCKET_FILE) - if os.path.exists(DownloadTest.FACEBOOK_FILE): - os.remove(DownloadTest.FACEBOOK_FILE) if os.path.exists(DownloadTest.BLIP_FILE): os.remove(DownloadTest.BLIP_FILE) - if os.path.exists(DownloadTest.VIMEO_FILE): - os.remove(DownloadTest.VIMEO_FILE) - if os.path.exists(DownloadTest.XVIDEO_FILE): - os.remove(DownloadTest.XVIDEO_FILE) def md5_for_file(filename, block_size=2**20): with open(filename) as f: