Merge remote-tracking branch 'origin/master' into fork_master
authorFilippo Valsorda <filippo.valsorda@gmail.com>
Thu, 29 Nov 2012 14:38:07 +0000 (15:38 +0100)
committerFilippo Valsorda <filippo.valsorda@gmail.com>
Thu, 29 Nov 2012 14:38:07 +0000 (15:38 +0100)
New tests - merged with md5 correction

1  2 
test/gentests.py
test/test_download.py
test/tests.json

index 0000000000000000000000000000000000000000,da4e3c2f68d4dbcf7f1f420304e8acc58356c509..c3cca51561e0cf01964edaa9aea299f44dac124e
mode 000000,100755..100755
--- /dev/null
@@@ -1,0 -1,128 +1,128 @@@
 -            return md5.hexdigest()
+ #!/usr/bin/env python3
+ import io  # for python 2
+ import json
+ import os
+ import sys
+ import unittest
+ # Allow direct execution
+ import os
+ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+ import youtube_dl.InfoExtractors
+ HEADER = u'''#!/usr/bin/env python
+ # DO NOT EDIT THIS FILE BY HAND!
+ # It is auto-generated from tests.json and gentests.py.
+ import hashlib
+ import io
+ import os
+ import json
+ import unittest
+ import sys
+ # Allow direct execution
+ import os
+ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+ from youtube_dl.FileDownloader import FileDownloader
+ import youtube_dl.InfoExtractors
+ def _file_md5(fn):
+     with open(fn, 'rb') as f:
+         return hashlib.md5(f.read()).hexdigest()
+ def md5_for_file(filename, block_size=2**20):
+     with open(filename) as f:
+         md5 = hashlib.md5()
+         while True:
+             data = f.read(block_size)
+             if not data:
+                 break
+             md5.update(data)
++        return md5.hexdigest()
+ _file_md5 = md5_for_file
+ try:
+     _skip_unless = unittest.skipUnless
+ except AttributeError: # Python 2.6
+     def _skip_unless(cond, reason='No reason given'):
+         def resfunc(f):
+             def wfunc(*args, **kwargs):
+                 if cond:
+                     return f(*args, **kwargs)
+                 else:
+                     print('Skipped test')
+                     return
+             return wfunc
+         return resfunc
+ _skip = lambda *args, **kwargs: _skip_unless(False, *args, **kwargs)
+ class DownloadTest(unittest.TestCase):
+     PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
+     def setUp(self):
+         # Clear old files
+         self.tearDown()
+         with io.open(self.PARAMETERS_FILE, encoding='utf-8') as pf:
+             self.parameters = json.load(pf)
+ '''
+ FOOTER = u'''
+ if __name__ == '__main__':
+     unittest.main()
+ '''
+ DEF_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'tests.json')
+ TEST_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'test_download.py')
+ def gentests():
+     with io.open(DEF_FILE, encoding='utf-8') as deff:
+         defs = json.load(deff)
+     with io.open(TEST_FILE, 'w', encoding='utf-8') as testf:
+         testf.write(HEADER)
+         spaces = ' ' * 4
+         write = lambda l: testf.write(spaces + l + '\n')
+         for d in defs:
+             name = d['name']
+             ie = getattr(youtube_dl.InfoExtractors, name + 'IE')
+             testf.write('\n')
+             write('@_skip_unless(youtube_dl.InfoExtractors.' + name + 'IE._WORKING, "IE marked as not _WORKING")')
+             if not d['file']:
+                 write('@_skip("No output file specified")')
+             elif 'skip' in d:
+                 write('@_skip(' + repr(d['skip']) + ')')
+             write('def test_' + name + '(self):')
+             write('    filename = ' + repr(d['file']))
+             write('    fd = FileDownloader(self.parameters)')
+             write('    fd.add_info_extractor(youtube_dl.InfoExtractors.' + name + 'IE())')
+             for ien in d.get('addIEs', []):
+                 write('    fd.add_info_extractor(youtube_dl.InfoExtractors.' + ien + 'IE())')
+             write('    fd.download([' + repr(d['url']) + '])')
+             write('    self.assertTrue(os.path.exists(filename))')
+             if 'size' in d:
+                 write('    self.assertEqual(os.path.getsize(filename), ' + repr(d['size']) + ')')
+             if 'md5' in d:
+                 write('    md5_for_file = _file_md5(filename)')
+                 write('    self.assertEqual(md5_for_file, ' + repr(d['md5']) + ')')
+         testf.write('\n\n')
+         write('def tearDown(self):')
+         for d in defs:
+             if d['file']:
+                 write('    if os.path.exists(' + repr(d['file']) + '):')
+                 write('        os.remove(' + repr(d['file']) + ')')
+             else:
+                 write('    # No file specified for ' + d['name'])
+         testf.write('\n')
+         testf.write(FOOTER)
+ if __name__ == '__main__':
+     gentests()
index 1a1b09db145140d19d42bc4b5a101bfeca9e34c6,0072d4aabddafbde55ba6a1142e8e47ac6ba8dcc..b7cb6cebb1531e1aa7a0cf65c6626ecb08205d08
@@@ -205,4 -29,158 +29,158 @@@ def md5_for_file(filename, block_size=2
              if not data:
                  break
              md5.update(data)
 -            return md5.hexdigest()
 +        return md5.hexdigest()
+ _file_md5 = md5_for_file
+ try:
+     _skip_unless = unittest.skipUnless
+ except AttributeError: # Python 2.6
+     def _skip_unless(cond, reason='No reason given'):
+         def resfunc(f):
+             def wfunc(*args, **kwargs):
+                 if cond:
+                     return f(*args, **kwargs)
+                 else:
+                     print('Skipped test')
+                     return
+             return wfunc
+         return resfunc
+ _skip = lambda *args, **kwargs: _skip_unless(False, *args, **kwargs)
+ class DownloadTest(unittest.TestCase):
+     PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
+     def setUp(self):
+         # Clear old files
+         self.tearDown()
+         with io.open(self.PARAMETERS_FILE, encoding='utf-8') as pf:
+             self.parameters = json.load(pf)
+     @_skip_unless(youtube_dl.InfoExtractors.YoutubeIE._WORKING, "IE marked as not _WORKING")
+     def test_Youtube(self):
+         filename = 'BaW_jenozKc.mp4'
+         fd = FileDownloader(self.parameters)
+         fd.add_info_extractor(youtube_dl.InfoExtractors.YoutubeIE())
+         fd.download(['http://www.youtube.com/watch?v=BaW_jenozKc'])
+         self.assertTrue(os.path.exists(filename))
+         self.assertEqual(os.path.getsize(filename), 1993883)
+     @_skip_unless(youtube_dl.InfoExtractors.DailymotionIE._WORKING, "IE marked as not _WORKING")
+     def test_Dailymotion(self):
+         filename = 'x33vw9.mp4'
+         fd = FileDownloader(self.parameters)
+         fd.add_info_extractor(youtube_dl.InfoExtractors.DailymotionIE())
+         fd.download(['http://www.dailymotion.com/video/x33vw9_tutoriel-de-youtubeur-dl-des-video_tech'])
+         self.assertTrue(os.path.exists(filename))
+         md5_for_file = _file_md5(filename)
+         self.assertEqual(md5_for_file, 'd363a50e9eb4f22ce90d08d15695bb47')
+     @_skip_unless(youtube_dl.InfoExtractors.MetacafeIE._WORKING, "IE marked as not _WORKING")
+     def test_Metacafe(self):
+         filename = 'aUehQsCQtM.flv'
+         fd = FileDownloader(self.parameters)
+         fd.add_info_extractor(youtube_dl.InfoExtractors.MetacafeIE())
+         fd.add_info_extractor(youtube_dl.InfoExtractors.YoutubeIE())
+         fd.download(['http://www.metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/'])
+         self.assertTrue(os.path.exists(filename))
+         self.assertEqual(os.path.getsize(filename), 5754305)
+     @_skip_unless(youtube_dl.InfoExtractors.BlipTVIE._WORKING, "IE marked as not _WORKING")
+     def test_BlipTV(self):
+         filename = '5779306.m4v'
+         fd = FileDownloader(self.parameters)
+         fd.add_info_extractor(youtube_dl.InfoExtractors.BlipTVIE())
+         fd.download(['http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352'])
+         self.assertTrue(os.path.exists(filename))
+         md5_for_file = _file_md5(filename)
 -        self.assertEqual(md5_for_file, '93c24d2f4e0782af13b8a7606ea97ba7')
++        self.assertEqual(md5_for_file, '4962f94441605832eb1008eb820ef47a')
+     @_skip_unless(youtube_dl.InfoExtractors.XVideosIE._WORKING, "IE marked as not _WORKING")
+     def test_XVideos(self):
+         filename = '939581.flv'
+         fd = FileDownloader(self.parameters)
+         fd.add_info_extractor(youtube_dl.InfoExtractors.XVideosIE())
+         fd.download(['http://www.xvideos.com/video939581/funny_porns_by_s_-1'])
+         self.assertTrue(os.path.exists(filename))
+         md5_for_file = _file_md5(filename)
 -        self.assertEqual(md5_for_file, '1ab4dedc01f771cb2a65e91caa801aaf')
++        self.assertEqual(md5_for_file, 'aecab2ea59b7996110a7e409f0c55da3')
+     @_skip_unless(youtube_dl.InfoExtractors.VimeoIE._WORKING, "IE marked as not _WORKING")
+     @_skip("No output file specified")
+     def test_Vimeo(self):
+         filename = ''
+         fd = FileDownloader(self.parameters)
+         fd.add_info_extractor(youtube_dl.InfoExtractors.VimeoIE())
+         fd.download(['http://vimeo.com/14160053'])
+         self.assertTrue(os.path.exists(filename))
+         md5_for_file = _file_md5(filename)
+         self.assertEqual(md5_for_file, '1ab4dedc01f771cb2a65e91caa801aaf')
+     @_skip_unless(youtube_dl.InfoExtractors.SoundcloudIE._WORKING, "IE marked as not _WORKING")
+     def test_Soundcloud(self):
+         filename = 'n6FLbx6ZzMiu.mp3'
+         fd = FileDownloader(self.parameters)
+         fd.add_info_extractor(youtube_dl.InfoExtractors.SoundcloudIE())
+         fd.download(['http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy'])
+         self.assertTrue(os.path.exists(filename))
+         md5_for_file = _file_md5(filename)
 -        self.assertEqual(md5_for_file, 'ce3775768ebb6432fa8495d446a078ed')
++        self.assertEqual(md5_for_file, 'c1b9b9ea8bfd620b96b2628664576e1c')
+     @_skip_unless(youtube_dl.InfoExtractors.StanfordOpenClassroomIE._WORKING, "IE marked as not _WORKING")
+     def test_StanfordOpenClassroom(self):
+         filename = 'PracticalUnix_intro-environment.mp4'
+         fd = FileDownloader(self.parameters)
+         fd.add_info_extractor(youtube_dl.InfoExtractors.StanfordOpenClassroomIE())
+         fd.download(['http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100'])
+         self.assertTrue(os.path.exists(filename))
+         md5_for_file = _file_md5(filename)
 -        self.assertEqual(md5_for_file, '22c8206291368c4e2c9c1a307f0ea0f4')
++        self.assertEqual(md5_for_file, '8aac7873a07dcfaed66b1559ab128514')
+     @_skip_unless(youtube_dl.InfoExtractors.CollegeHumorIE._WORKING, "IE marked as not _WORKING")
+     @_skip("No output file specified")
+     def test_CollegeHumor(self):
+         filename = ''
+         fd = FileDownloader(self.parameters)
+         fd.add_info_extractor(youtube_dl.InfoExtractors.CollegeHumorIE())
+         fd.download(['http://www.collegehumor.com/video/6830834/mitt-romney-style-gangnam-style-parody'])
+         self.assertTrue(os.path.exists(filename))
+         md5_for_file = _file_md5(filename)
+         self.assertEqual(md5_for_file, '')
+     @_skip_unless(youtube_dl.InfoExtractors.XNXXIE._WORKING, "IE marked as not _WORKING")
+     def test_XNXX(self):
+         filename = '1135332.flv'
+         fd = FileDownloader(self.parameters)
+         fd.add_info_extractor(youtube_dl.InfoExtractors.XNXXIE())
+         fd.download(['http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_'])
+         self.assertTrue(os.path.exists(filename))
+         md5_for_file = _file_md5(filename)
 -        self.assertEqual(md5_for_file, '5f0469c8d1dfd1bc38c8e6deb5e0a21d')
++        self.assertEqual(md5_for_file, 'c5c67df477eb0d9b058200351448ba4c')
+     def tearDown(self):
+         if os.path.exists('BaW_jenozKc.mp4'):
+             os.remove('BaW_jenozKc.mp4')
+         if os.path.exists('x33vw9.mp4'):
+             os.remove('x33vw9.mp4')
+         if os.path.exists('aUehQsCQtM.flv'):
+             os.remove('aUehQsCQtM.flv')
+         if os.path.exists('5779306.m4v'):
+             os.remove('5779306.m4v')
+         if os.path.exists('939581.flv'):
+             os.remove('939581.flv')
+         # No file specified for Vimeo
+         if os.path.exists('n6FLbx6ZzMiu.mp3'):
+             os.remove('n6FLbx6ZzMiu.mp3')
+         if os.path.exists('PracticalUnix_intro-environment.mp4'):
+             os.remove('PracticalUnix_intro-environment.mp4')
+         # No file specified for CollegeHumor
+         if os.path.exists('1135332.flv'):
+             os.remove('1135332.flv')
+ if __name__ == '__main__':
+     unittest.main()
diff --cc test/tests.json
index 0000000000000000000000000000000000000000,611780cc3b2b89ac2f3ff1cfc9fc026575d01641..731c91718d502b210086346ce3cd3b044a796e17
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,63 +1,63 @@@
 -    "md5":  "93c24d2f4e0782af13b8a7606ea97ba7",
+ [
+   {
+     "name": "Youtube",
+     "size": 1993883,
+     "url":  "http://www.youtube.com/watch?v=BaW_jenozKc",
+     "file":  "BaW_jenozKc.mp4"
+   },
+   {
+     "name": "Dailymotion",
+     "md5":  "d363a50e9eb4f22ce90d08d15695bb47",
+     "url":  "http://www.dailymotion.com/video/x33vw9_tutoriel-de-youtubeur-dl-des-video_tech",
+     "file":  "x33vw9.mp4"
+   },
+   {
+     "name": "Metacafe",
+     "size":  5754305,
+     "addIEs": ["Youtube"],
+     "url":  "http://www.metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/",
+     "file":  "aUehQsCQtM.flv"
+   },
+   {
+     "name": "BlipTV",
 -    "md5":  "1ab4dedc01f771cb2a65e91caa801aaf",
++    "md5":  "4962f94441605832eb1008eb820ef47a",
+     "url":  "http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352",
+     "file":  "5779306.m4v"
+   },
+   {
+     "name": "XVideos",
 -    "md5":  "ce3775768ebb6432fa8495d446a078ed",
++    "md5":  "aecab2ea59b7996110a7e409f0c55da3",
+     "url":  "http://www.xvideos.com/video939581/funny_porns_by_s_-1",
+     "file":  "939581.flv"
+   },
+   {
+     "name": "Vimeo",
+     "md5":  "1ab4dedc01f771cb2a65e91caa801aaf",
+     "url":  "http://vimeo.com/14160053",
+     "file": ""
+   },
+   {
+     "name": "Soundcloud",
 -    "md5":  "22c8206291368c4e2c9c1a307f0ea0f4",
++    "md5":  "c1b9b9ea8bfd620b96b2628664576e1c",
+     "url":  "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy",
+     "file":  "n6FLbx6ZzMiu.mp3"
+   },
+   {
+     "name": "StanfordOpenClassroom",
 -    "md5":  "5f0469c8d1dfd1bc38c8e6deb5e0a21d",
++    "md5":  "8aac7873a07dcfaed66b1559ab128514",
+     "url":  "http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100",
+     "file":  "PracticalUnix_intro-environment.mp4"
+   },
+   {
+     "name": "CollegeHumor",
+     "md5":  "",
+     "url":  "http://www.collegehumor.com/video/6830834/mitt-romney-style-gangnam-style-parody",
+     "file":  ""
+   },
+   {
+     "name": "XNXX",
++    "md5":  "c5c67df477eb0d9b058200351448ba4c",
+     "url":  "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_",
+     "file":  "1135332.flv"
+   }
+ ]