From 28767733814e0490fc426603d207efc966a00af0 Mon Sep 17 00:00:00 2001 From: gcmalloc Date: Tue, 23 Oct 2012 23:48:44 +0200 Subject: adding test for vimeo, xvideo and soundcloud --- test/test_download.py | 64 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 53 insertions(+), 11 deletions(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index 545afb922..9e0c52551 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -7,6 +7,8 @@ import json from youtube_dl.FileDownloader import FileDownloader from youtube_dl.InfoExtractors import YoutubeIE, DailymotionIE from youtube_dl.InfoExtractors import MetacafeIE, BlipTVIE +from youtube_dl.InfoExtractors import XVideosIE, VimeoIE +from youtube_dl.InfoExtractors import SoundcloudIE class DownloadTest(unittest.TestCase): @@ -30,10 +32,17 @@ class DownloadTest(unittest.TestCase): 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 = "" - XVIDEO_FILE = "" + XVIDEO_MD5 = "1ab4dedc01f771cb2a65e91caa801aaf" + XVIDEO_URL = "http://www.xvideos.com/video939581/funny_porns_by_s_-1" + XVIDEO_FILE = "939581.flv" + VIMEO_MD5 = "1ab4dedc01f771cb2a65e91caa801aaf" + VIMEO_URL = "http://vimeo.com/14160053" + VIMEO_FILE = "" + + SOUNDCLOUD_MD5 = "ce3775768ebb6432fa8495d446a078ed" + SOUNDCLOUD_URL = "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy" + SOUNDCLOUD_FILE = "n6FLbx6ZzMiu.mp3" def test_youtube(self): #let's download a file from youtube @@ -72,6 +81,33 @@ class DownloadTest(unittest.TestCase): md5_down_file = md5_for_file(DownloadTest.BLIP_FILE) self.assertEqual(md5_down_file, DownloadTest.BLIP_MD5) + def test_xvideo(self): + 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 test_vimeo(self): + 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_soundcloud(self): + with open(DownloadTest.PARAMETERS_FILE) as f: + fd = FileDownloader(json.load(f)) + fd.add_info_extractor(SoundcloudIE()) + fd.download([DownloadTest.SOUNDCLOUD_URL]) + self.assertTrue(os.path.exists(DownloadTest.SOUNDCLOUD_FILE)) + md5_down_file = md5_for_file(DownloadTest.SOUNDCLOUD_FILE) + self.assertEqual(md5_down_file, DownloadTest.SOUNDCLOUD_MD5) + def tearDown(self): if os.path.exists(DownloadTest.YOUTUBE_FILE): os.remove(DownloadTest.YOUTUBE_FILE) @@ -81,13 +117,19 @@ class DownloadTest(unittest.TestCase): os.remove(DownloadTest.METACAFE_FILE) if os.path.exists(DownloadTest.BLIP_FILE): os.remove(DownloadTest.BLIP_FILE) + if os.path.exists(DownloadTest.XVIDEO_FILE): + os.remove(DownloadTest.XVIDEO_FILE) + if os.path.exists(DownloadTest.VIMEO_FILE): + os.remove(DownloadTest.VIMEO_FILE) + if os.path.exists(DownloadTest.SOUNDCLOUD_FILE): + os.remove(DownloadTest.SOUNDCLOUD_FILE) 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() + 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() -- cgit v1.2.3 From 103c508ffa74f7b0bd463271ab9ed3df87a0da59 Mon Sep 17 00:00:00 2001 From: gcmalloc Date: Tue, 23 Oct 2012 23:59:12 +0200 Subject: adding stanford open class courses --- test/test_download.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index 9e0c52551..6ef166b2d 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -8,7 +8,7 @@ from youtube_dl.FileDownloader import FileDownloader from youtube_dl.InfoExtractors import YoutubeIE, DailymotionIE from youtube_dl.InfoExtractors import MetacafeIE, BlipTVIE from youtube_dl.InfoExtractors import XVideosIE, VimeoIE -from youtube_dl.InfoExtractors import SoundcloudIE +from youtube_dl.InfoExtractors import SoundcloudIE, StanfordOpenClassroomIE class DownloadTest(unittest.TestCase): @@ -44,6 +44,11 @@ class DownloadTest(unittest.TestCase): SOUNDCLOUD_URL = "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy" SOUNDCLOUD_FILE = "n6FLbx6ZzMiu.mp3" + + STANDFORD_MD5 = "22c8206291368c4e2c9c1a307f0ea0f4" + STANDFORD_URL = "http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100" + STANDFORD_FILE = "PracticalUnix_intro-environment.mp4" + def test_youtube(self): #let's download a file from youtube with open(DownloadTest.PARAMETERS_FILE) as f: @@ -108,6 +113,15 @@ class DownloadTest(unittest.TestCase): md5_down_file = md5_for_file(DownloadTest.SOUNDCLOUD_FILE) self.assertEqual(md5_down_file, DownloadTest.SOUNDCLOUD_MD5) + def test_standford(self): + with open(DownloadTest.PARAMETERS_FILE) as f: + fd = FileDownloader(json.load(f)) + fd.add_info_extractor(StanfordOpenClassroomIE()) + fd.download([DownloadTest.STANDFORD_URL]) + self.assertTrue(os.path.exists(DownloadTest.STANDFORD_FILE)) + md5_down_file = md5_for_file(DownloadTest.STANDFORD_FILE) + self.assertEqual(md5_down_file, DownloadTest.STANDFORD_MD5) + def tearDown(self): if os.path.exists(DownloadTest.YOUTUBE_FILE): os.remove(DownloadTest.YOUTUBE_FILE) @@ -123,6 +137,8 @@ class DownloadTest(unittest.TestCase): os.remove(DownloadTest.VIMEO_FILE) if os.path.exists(DownloadTest.SOUNDCLOUD_FILE): os.remove(DownloadTest.SOUNDCLOUD_FILE) + if os.path.exists(DownloadTest.STANDFORD_FILE): + os.remove(DownloadTest.STANDFORD_FILE) def md5_for_file(filename, block_size=2**20): with open(filename) as f: -- cgit v1.2.3 From 67af74992ec4f1d17d530c636fa53ffda1c3a99c Mon Sep 17 00:00:00 2001 From: gcmalloc Date: Wed, 24 Oct 2012 00:05:45 +0200 Subject: adding collegehumor test --- test/test_download.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index 6ef166b2d..d90d1583a 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -9,6 +9,7 @@ from youtube_dl.InfoExtractors import YoutubeIE, DailymotionIE from youtube_dl.InfoExtractors import MetacafeIE, BlipTVIE from youtube_dl.InfoExtractors import XVideosIE, VimeoIE from youtube_dl.InfoExtractors import SoundcloudIE, StanfordOpenClassroomIE +from youtube_dl.InfoExtractors import CollegeHumorIE class DownloadTest(unittest.TestCase): @@ -49,6 +50,10 @@ class DownloadTest(unittest.TestCase): STANDFORD_URL = "http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100" STANDFORD_FILE = "PracticalUnix_intro-environment.mp4" + COLLEGEHUMOR_MD5 = "" + COLLEGEHUMOR_URL = "http://www.collegehumor.com/video/6830834/mitt-romney-style-gangnam-style-parody" + COLLEGEHUMOR_FILE = "" + def test_youtube(self): #let's download a file from youtube with open(DownloadTest.PARAMETERS_FILE) as f: @@ -122,6 +127,15 @@ class DownloadTest(unittest.TestCase): md5_down_file = md5_for_file(DownloadTest.STANDFORD_FILE) self.assertEqual(md5_down_file, DownloadTest.STANDFORD_MD5) + def test_collegehumor(self): + with open(DownloadTest.PARAMETERS_FILE) as f: + fd = FileDownloader(json.load(f)) + fd.add_info_extractor(CollegeHumorIE()) + fd.download([DownloadTest.COLLEGEHUMOR_URL]) + self.assertTrue(os.path.exists(DownloadTest.COLLEGEHUMOR_FILE)) + md5_down_file = md5_for_file(DownloadTest.COLLEGEHUMOR_FILE) + self.assertEqual(md5_down_file, DownloadTest.COLLEGEHUMOR_MD5) + def tearDown(self): if os.path.exists(DownloadTest.YOUTUBE_FILE): os.remove(DownloadTest.YOUTUBE_FILE) @@ -139,6 +153,8 @@ class DownloadTest(unittest.TestCase): os.remove(DownloadTest.SOUNDCLOUD_FILE) if os.path.exists(DownloadTest.STANDFORD_FILE): os.remove(DownloadTest.STANDFORD_FILE) + if os.path.exists(DownloadTest.COLLEGEHUMOR_FILE): + os.remove(DownloadTest.COLLEGEHUMOR_FILE) def md5_for_file(filename, block_size=2**20): with open(filename) as f: -- cgit v1.2.3 From 9c6e9a4532f7856d3bff0e14e17cc2084bc5b022 Mon Sep 17 00:00:00 2001 From: gcmalloc Date: Wed, 24 Oct 2012 00:13:16 +0200 Subject: adding xnxx test --- test/test_download.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index d90d1583a..612280e6c 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -9,7 +9,7 @@ from youtube_dl.InfoExtractors import YoutubeIE, DailymotionIE from youtube_dl.InfoExtractors import MetacafeIE, BlipTVIE from youtube_dl.InfoExtractors import XVideosIE, VimeoIE from youtube_dl.InfoExtractors import SoundcloudIE, StanfordOpenClassroomIE -from youtube_dl.InfoExtractors import CollegeHumorIE +from youtube_dl.InfoExtractors import CollegeHumorIE, XNXXIE class DownloadTest(unittest.TestCase): @@ -54,6 +54,10 @@ class DownloadTest(unittest.TestCase): COLLEGEHUMOR_URL = "http://www.collegehumor.com/video/6830834/mitt-romney-style-gangnam-style-parody" COLLEGEHUMOR_FILE = "" + XNXX_MD5 = "5f0469c8d1dfd1bc38c8e6deb5e0a21d" + XNXX_URL = "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_" + XNXX_FILE = "1135332.flv" + def test_youtube(self): #let's download a file from youtube with open(DownloadTest.PARAMETERS_FILE) as f: @@ -136,6 +140,15 @@ class DownloadTest(unittest.TestCase): md5_down_file = md5_for_file(DownloadTest.COLLEGEHUMOR_FILE) self.assertEqual(md5_down_file, DownloadTest.COLLEGEHUMOR_MD5) + def test_xnxx(self): + with open(DownloadTest.PARAMETERS_FILE) as f: + fd = FileDownloader(json.load(f)) + fd.add_info_extractor(XNXXIE()) + fd.download([DownloadTest.XNXX_URL]) + self.assertTrue(os.path.exists(DownloadTest.XNXX_FILE)) + md5_down_file = md5_for_file(DownloadTest.XNXX_FILE) + self.assertEqual(md5_down_file, DownloadTest.XNXX_MD5) + def tearDown(self): if os.path.exists(DownloadTest.YOUTUBE_FILE): os.remove(DownloadTest.YOUTUBE_FILE) @@ -155,6 +168,8 @@ class DownloadTest(unittest.TestCase): os.remove(DownloadTest.STANDFORD_FILE) if os.path.exists(DownloadTest.COLLEGEHUMOR_FILE): os.remove(DownloadTest.COLLEGEHUMOR_FILE) + if os.path.exists(DownloadTest.XNXX_FILE): + os.remove(DownloadTest.XNXX_FILE) def md5_for_file(filename, block_size=2**20): with open(filename) as f: -- cgit v1.2.3 From fb0e99b8845a44f10df2592d6d8f8e227b2209fd Mon Sep 17 00:00:00 2001 From: gcmalloc Date: Wed, 24 Oct 2012 00:32:23 +0200 Subject: skipping vimeo for the moment --- test/test_download.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index 612280e6c..983454236 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -105,6 +105,8 @@ class DownloadTest(unittest.TestCase): self.assertEqual(md5_down_file, DownloadTest.XVIDEO_MD5) def test_vimeo(self): + #skipped for the moment produce an error + return with open(DownloadTest.PARAMETERS_FILE) as f: fd = FileDownloader(json.load(f)) fd.add_info_extractor(VimeoIE()) -- cgit v1.2.3 From a8ac2f866456b1dcf6fde8fd8e889688da67538f Mon Sep 17 00:00:00 2001 From: gcmalloc Date: Wed, 24 Oct 2012 15:57:19 +0200 Subject: adding second vimeo url --- test/test_download.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index 983454236..d1d6b119b 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -41,11 +41,14 @@ class DownloadTest(unittest.TestCase): VIMEO_URL = "http://vimeo.com/14160053" VIMEO_FILE = "" + VIMEO2_MD5 = "" + VIMEO2_URL = "http://player.vimeo.com/video/47019590" + VIMEO2_FILE = "" + SOUNDCLOUD_MD5 = "ce3775768ebb6432fa8495d446a078ed" SOUNDCLOUD_URL = "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy" SOUNDCLOUD_FILE = "n6FLbx6ZzMiu.mp3" - STANDFORD_MD5 = "22c8206291368c4e2c9c1a307f0ea0f4" STANDFORD_URL = "http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100" STANDFORD_FILE = "PracticalUnix_intro-environment.mp4" @@ -105,8 +108,8 @@ class DownloadTest(unittest.TestCase): self.assertEqual(md5_down_file, DownloadTest.XVIDEO_MD5) def test_vimeo(self): - #skipped for the moment produce an error - return + #skipped for the moment produce an error + return with open(DownloadTest.PARAMETERS_FILE) as f: fd = FileDownloader(json.load(f)) fd.add_info_extractor(VimeoIE()) @@ -115,6 +118,17 @@ class DownloadTest(unittest.TestCase): md5_down_file = md5_for_file(DownloadTest.VIMEO_FILE) self.assertEqual(md5_down_file, DownloadTest.VIMEO_MD5) + def test_vimeo2(self): + #skipped for the moment produce an error + return + with open(DownloadTest.PARAMETERS_FILE) as f: + fd = FileDownloader(json.load(f)) + fd.add_info_extractor(VimeoIE()) + fd.download([DownloadTest.VIMEO2_URL]) + self.assertTrue(os.path.exists(DownloadTest.VIMEO2_FILE)) + md5_down_file = md5_for_file(DownloadTest.VIMEO2_FILE) + self.assertEqual(md5_down_file, DownloadTest.VIMEO2_MD5) + def test_soundcloud(self): with open(DownloadTest.PARAMETERS_FILE) as f: fd = FileDownloader(json.load(f)) -- cgit v1.2.3 From 1c469a9480e9d8bea45950898eb46e07b0c58290 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Mon, 26 Nov 2012 23:58:46 +0100 Subject: New optoin --restrict-filenames --- test/test_utils.py | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/test_utils.py b/test/test_utils.py index e7c6d5b3d..0a435ddc5 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -30,11 +30,34 @@ class TestUtil(unittest.TestCase): self.assertEqual(u'yes no', sanitize_filename(u'yes? no')) self.assertEqual(u'this - that', sanitize_filename(u'this: that')) + self.assertEqual(sanitize_filename(u'AT&T'), u'AT&T') self.assertEqual(sanitize_filename(u'ä'), u'ä') self.assertEqual(sanitize_filename(u'кириллица'), u'кириллица') - for forbidden in u'"\0\\/': - self.assertTrue(forbidden not in sanitize_filename(forbidden)) + forbidden = u'"\0\\/' + for fc in forbidden: + for fbc in forbidden: + self.assertTrue(fbc not in sanitize_filename(fc)) + + def test_sanitize_filename_restricted(self): + self.assertEqual(sanitize_filename(u'abc', restricted=True), u'abc') + self.assertEqual(sanitize_filename(u'abc_d-e', restricted=True), u'abc_d-e') + + self.assertEqual(sanitize_filename(u'123', restricted=True), u'123') + + self.assertEqual(u'abc-de', sanitize_filename(u'abc/de', restricted=True)) + self.assertFalse(u'/' in sanitize_filename(u'abc/de///', restricted=True)) + + self.assertEqual(u'abc-de', sanitize_filename(u'abc/<>\\*|de', restricted=True)) + self.assertEqual(u'xxx', sanitize_filename(u'xxx/<>\\*|', restricted=True)) + self.assertEqual(u'yes_no', sanitize_filename(u'yes? no', restricted=True)) + self.assertEqual(u'this_-_that', sanitize_filename(u'this: that', restricted=True)) + + forbidden = u'"\0\\/&: \'\t\n' + for fc in forbidden: + print('input: ' + fc + ', result: ' + repr(sanitize_filename(fc, restricted=True))) + for fbc in forbidden: + self.assertTrue(fbc not in sanitize_filename(fc, restricted=True)) def test_ordered_set(self): self.assertEqual(orderedSet([1,1,2,3,4,4,5,6,7,3,5]), [1,2,3,4,5,6,7]) -- cgit v1.2.3 From 56781d3d2e476e2e109d0907d89548fd4da05058 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 27 Nov 2012 12:46:09 +0100 Subject: Switch back to underline for invalid characters, and make restricted ASCII-only --- test/test_utils.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/test_utils.py b/test/test_utils.py index 0a435ddc5..0b57e016c 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -22,10 +22,10 @@ class TestUtil(unittest.TestCase): self.assertEqual(sanitize_filename(u'123'), u'123') - self.assertEqual(u'abc-de', sanitize_filename(u'abc/de')) + self.assertEqual(u'abc_de', sanitize_filename(u'abc/de')) self.assertFalse(u'/' in sanitize_filename(u'abc/de///')) - self.assertEqual(u'abc-de', sanitize_filename(u'abc/<>\\*|de')) + self.assertEqual(u'abc_de', sanitize_filename(u'abc/<>\\*|de')) self.assertEqual(u'xxx', sanitize_filename(u'xxx/<>\\*|')) self.assertEqual(u'yes no', sanitize_filename(u'yes? no')) self.assertEqual(u'this - that', sanitize_filename(u'this: that')) @@ -45,14 +45,17 @@ class TestUtil(unittest.TestCase): self.assertEqual(sanitize_filename(u'123', restricted=True), u'123') - self.assertEqual(u'abc-de', sanitize_filename(u'abc/de', restricted=True)) + self.assertEqual(u'abc_de', sanitize_filename(u'abc/de', restricted=True)) self.assertFalse(u'/' in sanitize_filename(u'abc/de///', restricted=True)) - self.assertEqual(u'abc-de', sanitize_filename(u'abc/<>\\*|de', restricted=True)) + self.assertEqual(u'abc_de', sanitize_filename(u'abc/<>\\*|de', restricted=True)) self.assertEqual(u'xxx', sanitize_filename(u'xxx/<>\\*|', restricted=True)) self.assertEqual(u'yes_no', sanitize_filename(u'yes? no', restricted=True)) self.assertEqual(u'this_-_that', sanitize_filename(u'this: that', restricted=True)) + self.assertEqual(sanitize_filename(u'aäb', restricted=True), u'a_b') + self.assertTrue(sanitize_filename(u'ö', restricted=True) != u'') # No empty filename + forbidden = u'"\0\\/&: \'\t\n' for fc in forbidden: print('input: ' + fc + ', result: ' + repr(sanitize_filename(fc, restricted=True))) -- cgit v1.2.3 From c7032546f1f0536f594fe741274b2aae84a9d365 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 27 Nov 2012 12:46:27 +0100 Subject: Clean up test --- test/test_utils.py | 1 - 1 file changed, 1 deletion(-) (limited to 'test') diff --git a/test/test_utils.py b/test/test_utils.py index 0b57e016c..4208ee653 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -58,7 +58,6 @@ class TestUtil(unittest.TestCase): forbidden = u'"\0\\/&: \'\t\n' for fc in forbidden: - print('input: ' + fc + ', result: ' + repr(sanitize_filename(fc, restricted=True))) for fbc in forbidden: self.assertTrue(fbc not in sanitize_filename(fc, restricted=True)) -- cgit v1.2.3 From 46cbda0be4bed00122a5cf43e640808e6c32222d Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 27 Nov 2012 15:07:10 +0100 Subject: Minor filename encoding improvement in a common case --- test/test_utils.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'test') diff --git a/test/test_utils.py b/test/test_utils.py index 4208ee653..e806a10c5 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -61,6 +61,13 @@ class TestUtil(unittest.TestCase): for fbc in forbidden: self.assertTrue(fbc not in sanitize_filename(fc, restricted=True)) + # Handle a common case more neatly + self.assertEqual(sanitize_filename(u'大声带 - Song', restricted=True), u'Song') + self.assertEqual(sanitize_filename(u'总统: Speech', restricted=True), u'Speech') + # .. but make sure the file name is never empty + self.assertTrue(sanitize_filename(u'-', restricted=True) != u'') + self.assertTrue(sanitize_filename(u':', restricted=True) != u'') + def test_ordered_set(self): self.assertEqual(orderedSet([1,1,2,3,4,4,5,6,7,3,5]), [1,2,3,4,5,6,7]) self.assertEqual(orderedSet([]), []) -- cgit v1.2.3 From 1a911e60a4c2e15182a4c08683863a86a722b43f Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 27 Nov 2012 16:07:52 +0100 Subject: Add test for asian characters (#551) --- test/test_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/test_utils.py b/test/test_utils.py index e806a10c5..e7d4e0330 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -53,7 +53,7 @@ class TestUtil(unittest.TestCase): self.assertEqual(u'yes_no', sanitize_filename(u'yes? no', restricted=True)) self.assertEqual(u'this_-_that', sanitize_filename(u'this: that', restricted=True)) - self.assertEqual(sanitize_filename(u'aäb', restricted=True), u'a_b') + self.assertEqual(sanitize_filename(u'aäb中国的c', restricted=True), u'a_b_c') self.assertTrue(sanitize_filename(u'ö', restricted=True) != u'') # No empty filename forbidden = u'"\0\\/&: \'\t\n' -- cgit v1.2.3 From dffe658bac71531dc6aa72088c4d98f6a556bfbf Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 27 Nov 2012 17:15:33 +0100 Subject: Remove exclamation mark in --restrict-filenames mode --- test/test_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/test_utils.py b/test/test_utils.py index e7d4e0330..a3a23fbb4 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -56,7 +56,7 @@ class TestUtil(unittest.TestCase): self.assertEqual(sanitize_filename(u'aäb中国的c', restricted=True), u'a_b_c') self.assertTrue(sanitize_filename(u'ö', restricted=True) != u'') # No empty filename - forbidden = u'"\0\\/&: \'\t\n' + forbidden = u'"\0\\/&!: \'\t\n' for fc in forbidden: for fbc in forbidden: self.assertTrue(fbc not in sanitize_filename(fc, restricted=True)) -- cgit v1.2.3 From dae7c920f633605167aed534a000c85b3096ba56 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 27 Nov 2012 23:20:29 +0100 Subject: Make test_utils.py run on Python 3 --- test/test_utils.py | 77 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 32 deletions(-) (limited to 'test') diff --git a/test/test_utils.py b/test/test_utils.py index a3a23fbb4..b8fc13aef 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -1,15 +1,22 @@ -# -*- coding: utf-8 -*- - # Various small unit tests +import sys import unittest +# Allow direct execution +import os +sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + #from youtube_dl.utils import htmlentity_transform from youtube_dl.utils import timeconvert from youtube_dl.utils import sanitize_filename from youtube_dl.utils import unescapeHTML from youtube_dl.utils import orderedSet +if sys.version < (3,0): + _compat_str = lambda b: b.decode('unicode-escape') +else: + _compat_str = lambda s: s class TestUtil(unittest.TestCase): def test_timeconvert(self): @@ -17,56 +24,59 @@ class TestUtil(unittest.TestCase): self.assertTrue(timeconvert('bougrg') is None) def test_sanitize_filename(self): - self.assertEqual(sanitize_filename(u'abc'), u'abc') - self.assertEqual(sanitize_filename(u'abc_d-e'), u'abc_d-e') + self.assertEqual(sanitize_filename('abc'), 'abc') + self.assertEqual(sanitize_filename('abc_d-e'), 'abc_d-e') - self.assertEqual(sanitize_filename(u'123'), u'123') + self.assertEqual(sanitize_filename('123'), '123') - self.assertEqual(u'abc_de', sanitize_filename(u'abc/de')) - self.assertFalse(u'/' in sanitize_filename(u'abc/de///')) + self.assertEqual('abc_de', sanitize_filename('abc/de')) + self.assertFalse('/' in sanitize_filename('abc/de///')) - self.assertEqual(u'abc_de', sanitize_filename(u'abc/<>\\*|de')) - self.assertEqual(u'xxx', sanitize_filename(u'xxx/<>\\*|')) - self.assertEqual(u'yes no', sanitize_filename(u'yes? no')) - self.assertEqual(u'this - that', sanitize_filename(u'this: that')) + self.assertEqual('abc_de', sanitize_filename('abc/<>\\*|de')) + self.assertEqual('xxx', sanitize_filename('xxx/<>\\*|')) + self.assertEqual('yes no', sanitize_filename('yes? no')) + self.assertEqual('this - that', sanitize_filename('this: that')) - self.assertEqual(sanitize_filename(u'AT&T'), u'AT&T') - self.assertEqual(sanitize_filename(u'ä'), u'ä') - self.assertEqual(sanitize_filename(u'кириллица'), u'кириллица') + self.assertEqual(sanitize_filename('AT&T'), 'AT&T') + aumlaut = _compat_str('\xe4') + self.assertEqual(sanitize_filename(aumlaut), aumlaut) + tests = _compat_str('\u043a\u0438\u0440\u0438\u043b\u043b\u0438\u0446\u0430') + self.assertEqual(sanitize_filename(tests), tests) - forbidden = u'"\0\\/' + forbidden = '"\0\\/' for fc in forbidden: for fbc in forbidden: self.assertTrue(fbc not in sanitize_filename(fc)) def test_sanitize_filename_restricted(self): - self.assertEqual(sanitize_filename(u'abc', restricted=True), u'abc') - self.assertEqual(sanitize_filename(u'abc_d-e', restricted=True), u'abc_d-e') + self.assertEqual(sanitize_filename('abc', restricted=True), 'abc') + self.assertEqual(sanitize_filename('abc_d-e', restricted=True), 'abc_d-e') - self.assertEqual(sanitize_filename(u'123', restricted=True), u'123') + self.assertEqual(sanitize_filename('123', restricted=True), '123') - self.assertEqual(u'abc_de', sanitize_filename(u'abc/de', restricted=True)) - self.assertFalse(u'/' in sanitize_filename(u'abc/de///', restricted=True)) + self.assertEqual('abc_de', sanitize_filename('abc/de', restricted=True)) + self.assertFalse('/' in sanitize_filename('abc/de///', restricted=True)) - self.assertEqual(u'abc_de', sanitize_filename(u'abc/<>\\*|de', restricted=True)) - self.assertEqual(u'xxx', sanitize_filename(u'xxx/<>\\*|', restricted=True)) - self.assertEqual(u'yes_no', sanitize_filename(u'yes? no', restricted=True)) - self.assertEqual(u'this_-_that', sanitize_filename(u'this: that', restricted=True)) + self.assertEqual('abc_de', sanitize_filename('abc/<>\\*|de', restricted=True)) + self.assertEqual('xxx', sanitize_filename('xxx/<>\\*|', restricted=True)) + self.assertEqual('yes_no', sanitize_filename('yes? no', restricted=True)) + self.assertEqual('this_-_that', sanitize_filename('this: that', restricted=True)) - self.assertEqual(sanitize_filename(u'aäb中国的c', restricted=True), u'a_b_c') - self.assertTrue(sanitize_filename(u'ö', restricted=True) != u'') # No empty filename + tests =_compat_str('a\xe4b\u4e2d\u56fd\u7684c') + self.assertEqual(sanitize_filename(tests, restricted=True), 'a_b_c') + self.assertTrue(sanitize_filename(_compat_str('\xf6'), restricted=True) != '') # No empty filename - forbidden = u'"\0\\/&!: \'\t\n' + forbidden = '"\0\\/&!: \'\t\n' for fc in forbidden: for fbc in forbidden: self.assertTrue(fbc not in sanitize_filename(fc, restricted=True)) # Handle a common case more neatly - self.assertEqual(sanitize_filename(u'大声带 - Song', restricted=True), u'Song') - self.assertEqual(sanitize_filename(u'总统: Speech', restricted=True), u'Speech') + self.assertEqual(sanitize_filename(_compat_str('\u5927\u58f0\u5e26 - Song'), restricted=True), 'Song') + self.assertEqual(sanitize_filename(_compat_str('\u603b\u7edf: Speech'), restricted=True), 'Speech') # .. but make sure the file name is never empty - self.assertTrue(sanitize_filename(u'-', restricted=True) != u'') - self.assertTrue(sanitize_filename(u':', restricted=True) != u'') + self.assertTrue(sanitize_filename('-', restricted=True) != '') + self.assertTrue(sanitize_filename(':', restricted=True) != '') def test_ordered_set(self): self.assertEqual(orderedSet([1,1,2,3,4,4,5,6,7,3,5]), [1,2,3,4,5,6,7]) @@ -76,4 +86,7 @@ class TestUtil(unittest.TestCase): self.assertEqual(orderedSet([135,1,1,1]), [135,1]) def test_unescape_html(self): - self.assertEqual(unescapeHTML(u"%20;"), u"%20;") + self.assertEqual(unescapeHTML(_compat_str('%20;')), _compat_str('%20;')) + +if __name__ == '__main__': + unittest.main() -- cgit v1.2.3 From 8cd10ac4efb5168f3ceb18ec94338bce73e166a7 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Wed, 28 Nov 2012 00:46:21 +0100 Subject: Fix printing title etc. --- test/test_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/test_utils.py b/test/test_utils.py index b8fc13aef..e2f226bf1 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -13,7 +13,7 @@ from youtube_dl.utils import sanitize_filename from youtube_dl.utils import unescapeHTML from youtube_dl.utils import orderedSet -if sys.version < (3,0): +if sys.version_info < (3,0): _compat_str = lambda b: b.decode('unicode-escape') else: _compat_str = lambda s: s -- cgit v1.2.3 From be0f77d07598f339a90e50cb03f1022d99f5c0a8 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Wed, 28 Nov 2012 02:00:45 +0100 Subject: test import --- test/test_import.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 test/test_import.py (limited to 'test') diff --git a/test/test_import.py b/test/test_import.py new file mode 100644 index 000000000..6c5d0bcc1 --- /dev/null +++ b/test/test_import.py @@ -0,0 +1,13 @@ +import unittest + +import sys +import os.path +import subprocess + +class TestImport(unittest.TestCase): + def test_import(self): + rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + subprocess.check_call([sys.executable, '-c', 'import youtube_dl'], cwd=rootDir) + +if __name__ == '__main__': + unittest.main() -- cgit v1.2.3 From 59ae15a507cbf93de13f8fda8444d2d9a251747a Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Wed, 28 Nov 2012 02:04:46 +0100 Subject: Convert all tabs to 4 spaces (PEP8) --- test/test_download.py | 362 +++++++++++++++++++++++++------------------------- test/test_import.py | 8 +- test/test_utils.py | 142 ++++++++++---------- 3 files changed, 256 insertions(+), 256 deletions(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index d1d6b119b..b3fd7d992 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -13,186 +13,186 @@ from youtube_dl.InfoExtractors import CollegeHumorIE, XNXXIE class DownloadTest(unittest.TestCase): - PARAMETERS_FILE = "test/parameters.json" - #calculated with md5sum: - #md5sum (GNU coreutils) 8.19 - - 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" - - 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 = "1ab4dedc01f771cb2a65e91caa801aaf" - XVIDEO_URL = "http://www.xvideos.com/video939581/funny_porns_by_s_-1" - XVIDEO_FILE = "939581.flv" - - VIMEO_MD5 = "1ab4dedc01f771cb2a65e91caa801aaf" - VIMEO_URL = "http://vimeo.com/14160053" - VIMEO_FILE = "" - - VIMEO2_MD5 = "" - VIMEO2_URL = "http://player.vimeo.com/video/47019590" - VIMEO2_FILE = "" - - SOUNDCLOUD_MD5 = "ce3775768ebb6432fa8495d446a078ed" - SOUNDCLOUD_URL = "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy" - SOUNDCLOUD_FILE = "n6FLbx6ZzMiu.mp3" - - STANDFORD_MD5 = "22c8206291368c4e2c9c1a307f0ea0f4" - STANDFORD_URL = "http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100" - STANDFORD_FILE = "PracticalUnix_intro-environment.mp4" - - COLLEGEHUMOR_MD5 = "" - COLLEGEHUMOR_URL = "http://www.collegehumor.com/video/6830834/mitt-romney-style-gangnam-style-parody" - COLLEGEHUMOR_FILE = "" - - XNXX_MD5 = "5f0469c8d1dfd1bc38c8e6deb5e0a21d" - XNXX_URL = "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_" - XNXX_FILE = "1135332.flv" - - def test_youtube(self): - #let's download a file from youtube - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) - fd.add_info_extractor(YoutubeIE()) - fd.download([DownloadTest.YOUTUBE_URL]) - self.assertTrue(os.path.exists(DownloadTest.YOUTUBE_FILE)) - self.assertEqual(os.path.getsize(DownloadTest.YOUTUBE_FILE), DownloadTest.YOUTUBE_SIZE) - - def test_dailymotion(self): - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) - fd.add_info_extractor(DailymotionIE()) - fd.download([DownloadTest.DAILYMOTION_URL]) - self.assertTrue(os.path.exists(DownloadTest.DAILYMOTION_FILE)) - md5_down_file = md5_for_file(DownloadTest.DAILYMOTION_FILE) - self.assertEqual(md5_down_file, DownloadTest.DAILYMOTION_MD5) - - def test_metacafe(self): - #this emulate a skip,to be 2.6 compatible - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) - fd.add_info_extractor(MetacafeIE()) - fd.add_info_extractor(YoutubeIE()) - fd.download([DownloadTest.METACAFE_URL]) - self.assertTrue(os.path.exists(DownloadTest.METACAFE_FILE)) - self.assertEqual(os.path.getsize(DownloadTest.METACAFE_FILE), DownloadTest.METACAFE_SIZE) - - def test_blip(self): - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) - fd.add_info_extractor(BlipTVIE()) - fd.download([DownloadTest.BLIP_URL]) - self.assertTrue(os.path.exists(DownloadTest.BLIP_FILE)) - md5_down_file = md5_for_file(DownloadTest.BLIP_FILE) - self.assertEqual(md5_down_file, DownloadTest.BLIP_MD5) - - def test_xvideo(self): - 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 test_vimeo(self): - #skipped for the moment produce an error - 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_vimeo2(self): - #skipped for the moment produce an error - return - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) - fd.add_info_extractor(VimeoIE()) - fd.download([DownloadTest.VIMEO2_URL]) - self.assertTrue(os.path.exists(DownloadTest.VIMEO2_FILE)) - md5_down_file = md5_for_file(DownloadTest.VIMEO2_FILE) - self.assertEqual(md5_down_file, DownloadTest.VIMEO2_MD5) - - def test_soundcloud(self): - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) - fd.add_info_extractor(SoundcloudIE()) - fd.download([DownloadTest.SOUNDCLOUD_URL]) - self.assertTrue(os.path.exists(DownloadTest.SOUNDCLOUD_FILE)) - md5_down_file = md5_for_file(DownloadTest.SOUNDCLOUD_FILE) - self.assertEqual(md5_down_file, DownloadTest.SOUNDCLOUD_MD5) - - def test_standford(self): - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) - fd.add_info_extractor(StanfordOpenClassroomIE()) - fd.download([DownloadTest.STANDFORD_URL]) - self.assertTrue(os.path.exists(DownloadTest.STANDFORD_FILE)) - md5_down_file = md5_for_file(DownloadTest.STANDFORD_FILE) - self.assertEqual(md5_down_file, DownloadTest.STANDFORD_MD5) - - def test_collegehumor(self): - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) - fd.add_info_extractor(CollegeHumorIE()) - fd.download([DownloadTest.COLLEGEHUMOR_URL]) - self.assertTrue(os.path.exists(DownloadTest.COLLEGEHUMOR_FILE)) - md5_down_file = md5_for_file(DownloadTest.COLLEGEHUMOR_FILE) - self.assertEqual(md5_down_file, DownloadTest.COLLEGEHUMOR_MD5) - - def test_xnxx(self): - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) - fd.add_info_extractor(XNXXIE()) - fd.download([DownloadTest.XNXX_URL]) - self.assertTrue(os.path.exists(DownloadTest.XNXX_FILE)) - md5_down_file = md5_for_file(DownloadTest.XNXX_FILE) - self.assertEqual(md5_down_file, DownloadTest.XNXX_MD5) - - def tearDown(self): - if os.path.exists(DownloadTest.YOUTUBE_FILE): - os.remove(DownloadTest.YOUTUBE_FILE) - if os.path.exists(DownloadTest.DAILYMOTION_FILE): - os.remove(DownloadTest.DAILYMOTION_FILE) - if os.path.exists(DownloadTest.METACAFE_FILE): - os.remove(DownloadTest.METACAFE_FILE) - if os.path.exists(DownloadTest.BLIP_FILE): - os.remove(DownloadTest.BLIP_FILE) - if os.path.exists(DownloadTest.XVIDEO_FILE): - os.remove(DownloadTest.XVIDEO_FILE) - if os.path.exists(DownloadTest.VIMEO_FILE): - os.remove(DownloadTest.VIMEO_FILE) - if os.path.exists(DownloadTest.SOUNDCLOUD_FILE): - os.remove(DownloadTest.SOUNDCLOUD_FILE) - if os.path.exists(DownloadTest.STANDFORD_FILE): - os.remove(DownloadTest.STANDFORD_FILE) - if os.path.exists(DownloadTest.COLLEGEHUMOR_FILE): - os.remove(DownloadTest.COLLEGEHUMOR_FILE) - if os.path.exists(DownloadTest.XNXX_FILE): - os.remove(DownloadTest.XNXX_FILE) + PARAMETERS_FILE = "test/parameters.json" + #calculated with md5sum: + #md5sum (GNU coreutils) 8.19 + + 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" + + 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 = "1ab4dedc01f771cb2a65e91caa801aaf" + XVIDEO_URL = "http://www.xvideos.com/video939581/funny_porns_by_s_-1" + XVIDEO_FILE = "939581.flv" + + VIMEO_MD5 = "1ab4dedc01f771cb2a65e91caa801aaf" + VIMEO_URL = "http://vimeo.com/14160053" + VIMEO_FILE = "" + + VIMEO2_MD5 = "" + VIMEO2_URL = "http://player.vimeo.com/video/47019590" + VIMEO2_FILE = "" + + SOUNDCLOUD_MD5 = "ce3775768ebb6432fa8495d446a078ed" + SOUNDCLOUD_URL = "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy" + SOUNDCLOUD_FILE = "n6FLbx6ZzMiu.mp3" + + STANDFORD_MD5 = "22c8206291368c4e2c9c1a307f0ea0f4" + STANDFORD_URL = "http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100" + STANDFORD_FILE = "PracticalUnix_intro-environment.mp4" + + COLLEGEHUMOR_MD5 = "" + COLLEGEHUMOR_URL = "http://www.collegehumor.com/video/6830834/mitt-romney-style-gangnam-style-parody" + COLLEGEHUMOR_FILE = "" + + XNXX_MD5 = "5f0469c8d1dfd1bc38c8e6deb5e0a21d" + XNXX_URL = "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_" + XNXX_FILE = "1135332.flv" + + def test_youtube(self): + #let's download a file from youtube + with open(DownloadTest.PARAMETERS_FILE) as f: + fd = FileDownloader(json.load(f)) + fd.add_info_extractor(YoutubeIE()) + fd.download([DownloadTest.YOUTUBE_URL]) + self.assertTrue(os.path.exists(DownloadTest.YOUTUBE_FILE)) + self.assertEqual(os.path.getsize(DownloadTest.YOUTUBE_FILE), DownloadTest.YOUTUBE_SIZE) + + def test_dailymotion(self): + with open(DownloadTest.PARAMETERS_FILE) as f: + fd = FileDownloader(json.load(f)) + fd.add_info_extractor(DailymotionIE()) + fd.download([DownloadTest.DAILYMOTION_URL]) + self.assertTrue(os.path.exists(DownloadTest.DAILYMOTION_FILE)) + md5_down_file = md5_for_file(DownloadTest.DAILYMOTION_FILE) + self.assertEqual(md5_down_file, DownloadTest.DAILYMOTION_MD5) + + def test_metacafe(self): + #this emulate a skip,to be 2.6 compatible + with open(DownloadTest.PARAMETERS_FILE) as f: + fd = FileDownloader(json.load(f)) + fd.add_info_extractor(MetacafeIE()) + fd.add_info_extractor(YoutubeIE()) + fd.download([DownloadTest.METACAFE_URL]) + self.assertTrue(os.path.exists(DownloadTest.METACAFE_FILE)) + self.assertEqual(os.path.getsize(DownloadTest.METACAFE_FILE), DownloadTest.METACAFE_SIZE) + + def test_blip(self): + with open(DownloadTest.PARAMETERS_FILE) as f: + fd = FileDownloader(json.load(f)) + fd.add_info_extractor(BlipTVIE()) + fd.download([DownloadTest.BLIP_URL]) + self.assertTrue(os.path.exists(DownloadTest.BLIP_FILE)) + md5_down_file = md5_for_file(DownloadTest.BLIP_FILE) + self.assertEqual(md5_down_file, DownloadTest.BLIP_MD5) + + def test_xvideo(self): + 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 test_vimeo(self): + #skipped for the moment produce an error + 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_vimeo2(self): + #skipped for the moment produce an error + return + with open(DownloadTest.PARAMETERS_FILE) as f: + fd = FileDownloader(json.load(f)) + fd.add_info_extractor(VimeoIE()) + fd.download([DownloadTest.VIMEO2_URL]) + self.assertTrue(os.path.exists(DownloadTest.VIMEO2_FILE)) + md5_down_file = md5_for_file(DownloadTest.VIMEO2_FILE) + self.assertEqual(md5_down_file, DownloadTest.VIMEO2_MD5) + + def test_soundcloud(self): + with open(DownloadTest.PARAMETERS_FILE) as f: + fd = FileDownloader(json.load(f)) + fd.add_info_extractor(SoundcloudIE()) + fd.download([DownloadTest.SOUNDCLOUD_URL]) + self.assertTrue(os.path.exists(DownloadTest.SOUNDCLOUD_FILE)) + md5_down_file = md5_for_file(DownloadTest.SOUNDCLOUD_FILE) + self.assertEqual(md5_down_file, DownloadTest.SOUNDCLOUD_MD5) + + def test_standford(self): + with open(DownloadTest.PARAMETERS_FILE) as f: + fd = FileDownloader(json.load(f)) + fd.add_info_extractor(StanfordOpenClassroomIE()) + fd.download([DownloadTest.STANDFORD_URL]) + self.assertTrue(os.path.exists(DownloadTest.STANDFORD_FILE)) + md5_down_file = md5_for_file(DownloadTest.STANDFORD_FILE) + self.assertEqual(md5_down_file, DownloadTest.STANDFORD_MD5) + + def test_collegehumor(self): + with open(DownloadTest.PARAMETERS_FILE) as f: + fd = FileDownloader(json.load(f)) + fd.add_info_extractor(CollegeHumorIE()) + fd.download([DownloadTest.COLLEGEHUMOR_URL]) + self.assertTrue(os.path.exists(DownloadTest.COLLEGEHUMOR_FILE)) + md5_down_file = md5_for_file(DownloadTest.COLLEGEHUMOR_FILE) + self.assertEqual(md5_down_file, DownloadTest.COLLEGEHUMOR_MD5) + + def test_xnxx(self): + with open(DownloadTest.PARAMETERS_FILE) as f: + fd = FileDownloader(json.load(f)) + fd.add_info_extractor(XNXXIE()) + fd.download([DownloadTest.XNXX_URL]) + self.assertTrue(os.path.exists(DownloadTest.XNXX_FILE)) + md5_down_file = md5_for_file(DownloadTest.XNXX_FILE) + self.assertEqual(md5_down_file, DownloadTest.XNXX_MD5) + + def tearDown(self): + if os.path.exists(DownloadTest.YOUTUBE_FILE): + os.remove(DownloadTest.YOUTUBE_FILE) + if os.path.exists(DownloadTest.DAILYMOTION_FILE): + os.remove(DownloadTest.DAILYMOTION_FILE) + if os.path.exists(DownloadTest.METACAFE_FILE): + os.remove(DownloadTest.METACAFE_FILE) + if os.path.exists(DownloadTest.BLIP_FILE): + os.remove(DownloadTest.BLIP_FILE) + if os.path.exists(DownloadTest.XVIDEO_FILE): + os.remove(DownloadTest.XVIDEO_FILE) + if os.path.exists(DownloadTest.VIMEO_FILE): + os.remove(DownloadTest.VIMEO_FILE) + if os.path.exists(DownloadTest.SOUNDCLOUD_FILE): + os.remove(DownloadTest.SOUNDCLOUD_FILE) + if os.path.exists(DownloadTest.STANDFORD_FILE): + os.remove(DownloadTest.STANDFORD_FILE) + if os.path.exists(DownloadTest.COLLEGEHUMOR_FILE): + os.remove(DownloadTest.COLLEGEHUMOR_FILE) + if os.path.exists(DownloadTest.XNXX_FILE): + os.remove(DownloadTest.XNXX_FILE) 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() + 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() diff --git a/test/test_import.py b/test/test_import.py index 6c5d0bcc1..acf95444d 100644 --- a/test/test_import.py +++ b/test/test_import.py @@ -5,9 +5,9 @@ import os.path import subprocess class TestImport(unittest.TestCase): - def test_import(self): - rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - subprocess.check_call([sys.executable, '-c', 'import youtube_dl'], cwd=rootDir) + def test_import(self): + rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + subprocess.check_call([sys.executable, '-c', 'import youtube_dl'], cwd=rootDir) if __name__ == '__main__': - unittest.main() + unittest.main() diff --git a/test/test_utils.py b/test/test_utils.py index e2f226bf1..ceefabefc 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -14,79 +14,79 @@ from youtube_dl.utils import unescapeHTML from youtube_dl.utils import orderedSet if sys.version_info < (3,0): - _compat_str = lambda b: b.decode('unicode-escape') + _compat_str = lambda b: b.decode('unicode-escape') else: - _compat_str = lambda s: s + _compat_str = lambda s: s class TestUtil(unittest.TestCase): - def test_timeconvert(self): - self.assertTrue(timeconvert('') is None) - self.assertTrue(timeconvert('bougrg') is None) - - def test_sanitize_filename(self): - self.assertEqual(sanitize_filename('abc'), 'abc') - self.assertEqual(sanitize_filename('abc_d-e'), 'abc_d-e') - - self.assertEqual(sanitize_filename('123'), '123') - - self.assertEqual('abc_de', sanitize_filename('abc/de')) - self.assertFalse('/' in sanitize_filename('abc/de///')) - - self.assertEqual('abc_de', sanitize_filename('abc/<>\\*|de')) - self.assertEqual('xxx', sanitize_filename('xxx/<>\\*|')) - self.assertEqual('yes no', sanitize_filename('yes? no')) - self.assertEqual('this - that', sanitize_filename('this: that')) - - self.assertEqual(sanitize_filename('AT&T'), 'AT&T') - aumlaut = _compat_str('\xe4') - self.assertEqual(sanitize_filename(aumlaut), aumlaut) - tests = _compat_str('\u043a\u0438\u0440\u0438\u043b\u043b\u0438\u0446\u0430') - self.assertEqual(sanitize_filename(tests), tests) - - forbidden = '"\0\\/' - for fc in forbidden: - for fbc in forbidden: - self.assertTrue(fbc not in sanitize_filename(fc)) - - def test_sanitize_filename_restricted(self): - self.assertEqual(sanitize_filename('abc', restricted=True), 'abc') - self.assertEqual(sanitize_filename('abc_d-e', restricted=True), 'abc_d-e') - - self.assertEqual(sanitize_filename('123', restricted=True), '123') - - self.assertEqual('abc_de', sanitize_filename('abc/de', restricted=True)) - self.assertFalse('/' in sanitize_filename('abc/de///', restricted=True)) - - self.assertEqual('abc_de', sanitize_filename('abc/<>\\*|de', restricted=True)) - self.assertEqual('xxx', sanitize_filename('xxx/<>\\*|', restricted=True)) - self.assertEqual('yes_no', sanitize_filename('yes? no', restricted=True)) - self.assertEqual('this_-_that', sanitize_filename('this: that', restricted=True)) - - tests =_compat_str('a\xe4b\u4e2d\u56fd\u7684c') - self.assertEqual(sanitize_filename(tests, restricted=True), 'a_b_c') - self.assertTrue(sanitize_filename(_compat_str('\xf6'), restricted=True) != '') # No empty filename - - forbidden = '"\0\\/&!: \'\t\n' - for fc in forbidden: - for fbc in forbidden: - self.assertTrue(fbc not in sanitize_filename(fc, restricted=True)) - - # Handle a common case more neatly - self.assertEqual(sanitize_filename(_compat_str('\u5927\u58f0\u5e26 - Song'), restricted=True), 'Song') - self.assertEqual(sanitize_filename(_compat_str('\u603b\u7edf: Speech'), restricted=True), 'Speech') - # .. but make sure the file name is never empty - self.assertTrue(sanitize_filename('-', restricted=True) != '') - self.assertTrue(sanitize_filename(':', restricted=True) != '') - - def test_ordered_set(self): - self.assertEqual(orderedSet([1,1,2,3,4,4,5,6,7,3,5]), [1,2,3,4,5,6,7]) - self.assertEqual(orderedSet([]), []) - self.assertEqual(orderedSet([1]), [1]) - #keep the list ordered - self.assertEqual(orderedSet([135,1,1,1]), [135,1]) - - def test_unescape_html(self): - self.assertEqual(unescapeHTML(_compat_str('%20;')), _compat_str('%20;')) + def test_timeconvert(self): + self.assertTrue(timeconvert('') is None) + self.assertTrue(timeconvert('bougrg') is None) + + def test_sanitize_filename(self): + self.assertEqual(sanitize_filename('abc'), 'abc') + self.assertEqual(sanitize_filename('abc_d-e'), 'abc_d-e') + + self.assertEqual(sanitize_filename('123'), '123') + + self.assertEqual('abc_de', sanitize_filename('abc/de')) + self.assertFalse('/' in sanitize_filename('abc/de///')) + + self.assertEqual('abc_de', sanitize_filename('abc/<>\\*|de')) + self.assertEqual('xxx', sanitize_filename('xxx/<>\\*|')) + self.assertEqual('yes no', sanitize_filename('yes? no')) + self.assertEqual('this - that', sanitize_filename('this: that')) + + self.assertEqual(sanitize_filename('AT&T'), 'AT&T') + aumlaut = _compat_str('\xe4') + self.assertEqual(sanitize_filename(aumlaut), aumlaut) + tests = _compat_str('\u043a\u0438\u0440\u0438\u043b\u043b\u0438\u0446\u0430') + self.assertEqual(sanitize_filename(tests), tests) + + forbidden = '"\0\\/' + for fc in forbidden: + for fbc in forbidden: + self.assertTrue(fbc not in sanitize_filename(fc)) + + def test_sanitize_filename_restricted(self): + self.assertEqual(sanitize_filename('abc', restricted=True), 'abc') + self.assertEqual(sanitize_filename('abc_d-e', restricted=True), 'abc_d-e') + + self.assertEqual(sanitize_filename('123', restricted=True), '123') + + self.assertEqual('abc_de', sanitize_filename('abc/de', restricted=True)) + self.assertFalse('/' in sanitize_filename('abc/de///', restricted=True)) + + self.assertEqual('abc_de', sanitize_filename('abc/<>\\*|de', restricted=True)) + self.assertEqual('xxx', sanitize_filename('xxx/<>\\*|', restricted=True)) + self.assertEqual('yes_no', sanitize_filename('yes? no', restricted=True)) + self.assertEqual('this_-_that', sanitize_filename('this: that', restricted=True)) + + tests =_compat_str('a\xe4b\u4e2d\u56fd\u7684c') + self.assertEqual(sanitize_filename(tests, restricted=True), 'a_b_c') + self.assertTrue(sanitize_filename(_compat_str('\xf6'), restricted=True) != '') # No empty filename + + forbidden = '"\0\\/&!: \'\t\n' + for fc in forbidden: + for fbc in forbidden: + self.assertTrue(fbc not in sanitize_filename(fc, restricted=True)) + + # Handle a common case more neatly + self.assertEqual(sanitize_filename(_compat_str('\u5927\u58f0\u5e26 - Song'), restricted=True), 'Song') + self.assertEqual(sanitize_filename(_compat_str('\u603b\u7edf: Speech'), restricted=True), 'Speech') + # .. but make sure the file name is never empty + self.assertTrue(sanitize_filename('-', restricted=True) != '') + self.assertTrue(sanitize_filename(':', restricted=True) != '') + + def test_ordered_set(self): + self.assertEqual(orderedSet([1,1,2,3,4,4,5,6,7,3,5]), [1,2,3,4,5,6,7]) + self.assertEqual(orderedSet([]), []) + self.assertEqual(orderedSet([1]), [1]) + #keep the list ordered + self.assertEqual(orderedSet([135,1,1,1]), [135,1]) + + def test_unescape_html(self): + self.assertEqual(unescapeHTML(_compat_str('%20;')), _compat_str('%20;')) if __name__ == '__main__': - unittest.main() + unittest.main() -- cgit v1.2.3 From 627dcfff398b00429c8b310f1c1775f9be6f0268 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Wed, 28 Nov 2012 12:59:27 +0100 Subject: Restrict more characters (Closes #566) --- test/test_utils.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/test_utils.py b/test/test_utils.py index ceefabefc..fd8190f51 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -13,11 +13,12 @@ from youtube_dl.utils import sanitize_filename from youtube_dl.utils import unescapeHTML from youtube_dl.utils import orderedSet -if sys.version_info < (3,0): +if sys.version_info < (3, 0): _compat_str = lambda b: b.decode('unicode-escape') else: _compat_str = lambda s: s + class TestUtil(unittest.TestCase): def test_timeconvert(self): self.assertTrue(timeconvert('') is None) @@ -62,11 +63,11 @@ class TestUtil(unittest.TestCase): self.assertEqual('yes_no', sanitize_filename('yes? no', restricted=True)) self.assertEqual('this_-_that', sanitize_filename('this: that', restricted=True)) - tests =_compat_str('a\xe4b\u4e2d\u56fd\u7684c') + tests = _compat_str('a\xe4b\u4e2d\u56fd\u7684c') self.assertEqual(sanitize_filename(tests, restricted=True), 'a_b_c') - self.assertTrue(sanitize_filename(_compat_str('\xf6'), restricted=True) != '') # No empty filename + self.assertTrue(sanitize_filename(_compat_str('\xf6'), restricted=True) != '') # No empty filename - forbidden = '"\0\\/&!: \'\t\n' + forbidden = '"\0\\/&!: \'\t\n()[]{}$;`^,#' for fc in forbidden: for fbc in forbidden: self.assertTrue(fbc not in sanitize_filename(fc, restricted=True)) @@ -79,11 +80,11 @@ class TestUtil(unittest.TestCase): self.assertTrue(sanitize_filename(':', restricted=True) != '') def test_ordered_set(self): - self.assertEqual(orderedSet([1,1,2,3,4,4,5,6,7,3,5]), [1,2,3,4,5,6,7]) + self.assertEqual(orderedSet([1, 1, 2, 3, 4, 4, 5, 6, 7, 3, 5]), [1, 2, 3, 4, 5, 6, 7]) self.assertEqual(orderedSet([]), []) self.assertEqual(orderedSet([1]), [1]) #keep the list ordered - self.assertEqual(orderedSet([135,1,1,1]), [135,1]) + self.assertEqual(orderedSet([135, 1, 1, 1]), [135, 1]) def test_unescape_html(self): self.assertEqual(unescapeHTML(_compat_str('%20;')), _compat_str('%20;')) -- cgit v1.2.3 From cdab8aa389a81b82ed3a2d72b05df5445d4b0668 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Wed, 28 Nov 2012 15:09:56 +0100 Subject: Update download tests --- test/gentests.py | 114 ++++++++++++++++++ test/test_download.py | 328 +++++++++++++++++++++++--------------------------- test/tests.json | 63 ++++++++++ 3 files changed, 327 insertions(+), 178 deletions(-) create mode 100755 test/gentests.py create mode 100644 test/tests.json (limited to 'test') diff --git a/test/gentests.py b/test/gentests.py new file mode 100755 index 000000000..8a76ff9f7 --- /dev/null +++ b/test/gentests.py @@ -0,0 +1,114 @@ +#!/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 + +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') + if not ie._WORKING: + write('@unittest.skip("IE marked as not _WORKING")') + elif not d['file']: + write('@unittest.skip("No output file specified")') + elif 'skip' in d: + write('@unittest.skip(' + repr(d['skip']) + ')') + write('def test_' + name + '(self):') + write(' ' + name + 'IE = youtube_dl.InfoExtractors.' + name + 'IE') + write(' filename = ' + repr(d['file'])) + write(' fd = FileDownloader(self.parameters)') + write(' fd.add_info_extractor(' + 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() diff --git a/test/test_download.py b/test/test_download.py index b3fd7d992..92b552267 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -1,198 +1,170 @@ -#!/usr/bin/env python2 -import unittest +#!/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 -from youtube_dl.InfoExtractors import YoutubeIE, DailymotionIE -from youtube_dl.InfoExtractors import MetacafeIE, BlipTVIE -from youtube_dl.InfoExtractors import XVideosIE, VimeoIE -from youtube_dl.InfoExtractors import SoundcloudIE, StanfordOpenClassroomIE -from youtube_dl.InfoExtractors import CollegeHumorIE, XNXXIE +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 class DownloadTest(unittest.TestCase): - PARAMETERS_FILE = "test/parameters.json" - #calculated with md5sum: - #md5sum (GNU coreutils) 8.19 - - 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" - - 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 = "1ab4dedc01f771cb2a65e91caa801aaf" - XVIDEO_URL = "http://www.xvideos.com/video939581/funny_porns_by_s_-1" - XVIDEO_FILE = "939581.flv" - - VIMEO_MD5 = "1ab4dedc01f771cb2a65e91caa801aaf" - VIMEO_URL = "http://vimeo.com/14160053" - VIMEO_FILE = "" - - VIMEO2_MD5 = "" - VIMEO2_URL = "http://player.vimeo.com/video/47019590" - VIMEO2_FILE = "" - - SOUNDCLOUD_MD5 = "ce3775768ebb6432fa8495d446a078ed" - SOUNDCLOUD_URL = "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy" - SOUNDCLOUD_FILE = "n6FLbx6ZzMiu.mp3" - - STANDFORD_MD5 = "22c8206291368c4e2c9c1a307f0ea0f4" - STANDFORD_URL = "http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100" - STANDFORD_FILE = "PracticalUnix_intro-environment.mp4" - - COLLEGEHUMOR_MD5 = "" - COLLEGEHUMOR_URL = "http://www.collegehumor.com/video/6830834/mitt-romney-style-gangnam-style-parody" - COLLEGEHUMOR_FILE = "" - - XNXX_MD5 = "5f0469c8d1dfd1bc38c8e6deb5e0a21d" - XNXX_URL = "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_" - XNXX_FILE = "1135332.flv" - - def test_youtube(self): - #let's download a file from youtube - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) - fd.add_info_extractor(YoutubeIE()) - fd.download([DownloadTest.YOUTUBE_URL]) - self.assertTrue(os.path.exists(DownloadTest.YOUTUBE_FILE)) - self.assertEqual(os.path.getsize(DownloadTest.YOUTUBE_FILE), DownloadTest.YOUTUBE_SIZE) + PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json") - def test_dailymotion(self): - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) + def setUp(self): + # Clear old files + self.tearDown() + + with io.open(self.PARAMETERS_FILE, encoding='utf-8') as pf: + self.parameters = json.load(pf) + + def test_Youtube(self): + YoutubeIE = youtube_dl.InfoExtractors.YoutubeIE + filename = 'BaW_jenozKc.mp4' + fd = FileDownloader(self.parameters) + fd.add_info_extractor(YoutubeIE()) + fd.download(['http://www.youtube.com/watch?v=BaW_jenozKc']) + self.assertTrue(os.path.exists(filename)) + self.assertEqual(os.path.getsize(filename), 1993883) + + def test_Dailymotion(self): + DailymotionIE = youtube_dl.InfoExtractors.DailymotionIE + filename = 'x33vw9.mp4' + fd = FileDownloader(self.parameters) fd.add_info_extractor(DailymotionIE()) - fd.download([DownloadTest.DAILYMOTION_URL]) - self.assertTrue(os.path.exists(DownloadTest.DAILYMOTION_FILE)) - md5_down_file = md5_for_file(DownloadTest.DAILYMOTION_FILE) - self.assertEqual(md5_down_file, DownloadTest.DAILYMOTION_MD5) - - def test_metacafe(self): - #this emulate a skip,to be 2.6 compatible - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) + 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') + + def test_Metacafe(self): + MetacafeIE = youtube_dl.InfoExtractors.MetacafeIE + filename = 'aUehQsCQtM.flv' + fd = FileDownloader(self.parameters) fd.add_info_extractor(MetacafeIE()) - fd.add_info_extractor(YoutubeIE()) - fd.download([DownloadTest.METACAFE_URL]) - self.assertTrue(os.path.exists(DownloadTest.METACAFE_FILE)) - self.assertEqual(os.path.getsize(DownloadTest.METACAFE_FILE), DownloadTest.METACAFE_SIZE) - - def test_blip(self): - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) + 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) + + def test_BlipTV(self): + BlipTVIE = youtube_dl.InfoExtractors.BlipTVIE + filename = '5779306.m4v' + fd = FileDownloader(self.parameters) fd.add_info_extractor(BlipTVIE()) - fd.download([DownloadTest.BLIP_URL]) - self.assertTrue(os.path.exists(DownloadTest.BLIP_FILE)) - md5_down_file = md5_for_file(DownloadTest.BLIP_FILE) - self.assertEqual(md5_down_file, DownloadTest.BLIP_MD5) - - def test_xvideo(self): - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) + 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') + + def test_XVideos(self): + XVideosIE = youtube_dl.InfoExtractors.XVideosIE + filename = '939581.flv' + fd = FileDownloader(self.parameters) 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 test_vimeo(self): - #skipped for the moment produce an error - return - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) + 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') + + @unittest.skip("No output file specified") + def test_Vimeo(self): + VimeoIE = youtube_dl.InfoExtractors.VimeoIE + filename = '' + fd = FileDownloader(self.parameters) 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_vimeo2(self): - #skipped for the moment produce an error - return - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) - fd.add_info_extractor(VimeoIE()) - fd.download([DownloadTest.VIMEO2_URL]) - self.assertTrue(os.path.exists(DownloadTest.VIMEO2_FILE)) - md5_down_file = md5_for_file(DownloadTest.VIMEO2_FILE) - self.assertEqual(md5_down_file, DownloadTest.VIMEO2_MD5) - - def test_soundcloud(self): - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) + fd.download(['http://vimeo.com/14160053']) + self.assertTrue(os.path.exists(filename)) + md5_for_file = _file_md5(filename) + self.assertEqual(md5_for_file, '1ab4dedc01f771cb2a65e91caa801aaf') + + def test_Soundcloud(self): + SoundcloudIE = youtube_dl.InfoExtractors.SoundcloudIE + filename = 'n6FLbx6ZzMiu.mp3' + fd = FileDownloader(self.parameters) fd.add_info_extractor(SoundcloudIE()) - fd.download([DownloadTest.SOUNDCLOUD_URL]) - self.assertTrue(os.path.exists(DownloadTest.SOUNDCLOUD_FILE)) - md5_down_file = md5_for_file(DownloadTest.SOUNDCLOUD_FILE) - self.assertEqual(md5_down_file, DownloadTest.SOUNDCLOUD_MD5) - - def test_standford(self): - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) + 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') + + def test_StanfordOpenClassroom(self): + StanfordOpenClassroomIE = youtube_dl.InfoExtractors.StanfordOpenClassroomIE + filename = 'PracticalUnix_intro-environment.mp4' + fd = FileDownloader(self.parameters) fd.add_info_extractor(StanfordOpenClassroomIE()) - fd.download([DownloadTest.STANDFORD_URL]) - self.assertTrue(os.path.exists(DownloadTest.STANDFORD_FILE)) - md5_down_file = md5_for_file(DownloadTest.STANDFORD_FILE) - self.assertEqual(md5_down_file, DownloadTest.STANDFORD_MD5) - - def test_collegehumor(self): - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) + 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') + + @unittest.skip("IE marked as not _WORKING") + def test_CollegeHumor(self): + CollegeHumorIE = youtube_dl.InfoExtractors.CollegeHumorIE + filename = '' + fd = FileDownloader(self.parameters) fd.add_info_extractor(CollegeHumorIE()) - fd.download([DownloadTest.COLLEGEHUMOR_URL]) - self.assertTrue(os.path.exists(DownloadTest.COLLEGEHUMOR_FILE)) - md5_down_file = md5_for_file(DownloadTest.COLLEGEHUMOR_FILE) - self.assertEqual(md5_down_file, DownloadTest.COLLEGEHUMOR_MD5) - - def test_xnxx(self): - with open(DownloadTest.PARAMETERS_FILE) as f: - fd = FileDownloader(json.load(f)) + 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, '') + + def test_XNXX(self): + XNXXIE = youtube_dl.InfoExtractors.XNXXIE + filename = '1135332.flv' + fd = FileDownloader(self.parameters) fd.add_info_extractor(XNXXIE()) - fd.download([DownloadTest.XNXX_URL]) - self.assertTrue(os.path.exists(DownloadTest.XNXX_FILE)) - md5_down_file = md5_for_file(DownloadTest.XNXX_FILE) - self.assertEqual(md5_down_file, DownloadTest.XNXX_MD5) + 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') - def tearDown(self): - if os.path.exists(DownloadTest.YOUTUBE_FILE): - os.remove(DownloadTest.YOUTUBE_FILE) - if os.path.exists(DownloadTest.DAILYMOTION_FILE): - os.remove(DownloadTest.DAILYMOTION_FILE) - if os.path.exists(DownloadTest.METACAFE_FILE): - os.remove(DownloadTest.METACAFE_FILE) - if os.path.exists(DownloadTest.BLIP_FILE): - os.remove(DownloadTest.BLIP_FILE) - if os.path.exists(DownloadTest.XVIDEO_FILE): - os.remove(DownloadTest.XVIDEO_FILE) - if os.path.exists(DownloadTest.VIMEO_FILE): - os.remove(DownloadTest.VIMEO_FILE) - if os.path.exists(DownloadTest.SOUNDCLOUD_FILE): - os.remove(DownloadTest.SOUNDCLOUD_FILE) - if os.path.exists(DownloadTest.STANDFORD_FILE): - os.remove(DownloadTest.STANDFORD_FILE) - if os.path.exists(DownloadTest.COLLEGEHUMOR_FILE): - os.remove(DownloadTest.COLLEGEHUMOR_FILE) - if os.path.exists(DownloadTest.XNXX_FILE): - os.remove(DownloadTest.XNXX_FILE) -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() + 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 --git a/test/tests.json b/test/tests.json new file mode 100644 index 000000000..611780cc3 --- /dev/null +++ b/test/tests.json @@ -0,0 +1,63 @@ +[ + { + "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": "93c24d2f4e0782af13b8a7606ea97ba7", + "url": "http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352", + "file": "5779306.m4v" + }, + { + "name": "XVideos", + "md5": "1ab4dedc01f771cb2a65e91caa801aaf", + "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": "ce3775768ebb6432fa8495d446a078ed", + "url": "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy", + "file": "n6FLbx6ZzMiu.mp3" + }, + { + "name": "StanfordOpenClassroom", + "md5": "22c8206291368c4e2c9c1a307f0ea0f4", + "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": "5f0469c8d1dfd1bc38c8e6deb5e0a21d", + "url": "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_", + "file": "1135332.flv" + } +] \ No newline at end of file -- cgit v1.2.3 From 81760416054be7dcccc66b14d171872c8e13f183 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Wed, 28 Nov 2012 19:03:11 +0100 Subject: Check during test runtime instead of test generation for _WORKING, and add 2.6 compat --- test/gentests.py | 28 ++++++++++++++++++------ test/test_download.py | 60 ++++++++++++++++++++++++++++++++------------------- 2 files changed, 59 insertions(+), 29 deletions(-) (limited to 'test') diff --git a/test/gentests.py b/test/gentests.py index 8a76ff9f7..da4e3c2f6 100755 --- a/test/gentests.py +++ b/test/gentests.py @@ -46,6 +46,22 @@ def md5_for_file(filename, block_size=2**20): 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") @@ -78,17 +94,15 @@ def gentests(): name = d['name'] ie = getattr(youtube_dl.InfoExtractors, name + 'IE') testf.write('\n') - if not ie._WORKING: - write('@unittest.skip("IE marked as not _WORKING")') - elif not d['file']: - write('@unittest.skip("No output file specified")') + 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('@unittest.skip(' + repr(d['skip']) + ')') + write('@_skip(' + repr(d['skip']) + ')') write('def test_' + name + '(self):') - write(' ' + name + 'IE = youtube_dl.InfoExtractors.' + name + 'IE') write(' filename = ' + repr(d['file'])) write(' fd = FileDownloader(self.parameters)') - write(' fd.add_info_extractor(' + name + 'IE())') + 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']) + '])') diff --git a/test/test_download.py b/test/test_download.py index 92b552267..0072d4aab 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -32,6 +32,22 @@ def md5_for_file(filename, block_size=2**20): 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") @@ -42,102 +58,102 @@ class DownloadTest(unittest.TestCase): 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): - YoutubeIE = youtube_dl.InfoExtractors.YoutubeIE filename = 'BaW_jenozKc.mp4' fd = FileDownloader(self.parameters) - fd.add_info_extractor(YoutubeIE()) + 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): - DailymotionIE = youtube_dl.InfoExtractors.DailymotionIE filename = 'x33vw9.mp4' fd = FileDownloader(self.parameters) - fd.add_info_extractor(DailymotionIE()) + 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): - MetacafeIE = youtube_dl.InfoExtractors.MetacafeIE filename = 'aUehQsCQtM.flv' fd = FileDownloader(self.parameters) - fd.add_info_extractor(MetacafeIE()) + 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): - BlipTVIE = youtube_dl.InfoExtractors.BlipTVIE filename = '5779306.m4v' fd = FileDownloader(self.parameters) - fd.add_info_extractor(BlipTVIE()) + 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') + @_skip_unless(youtube_dl.InfoExtractors.XVideosIE._WORKING, "IE marked as not _WORKING") def test_XVideos(self): - XVideosIE = youtube_dl.InfoExtractors.XVideosIE filename = '939581.flv' fd = FileDownloader(self.parameters) - fd.add_info_extractor(XVideosIE()) + 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') - @unittest.skip("No output file specified") + @_skip_unless(youtube_dl.InfoExtractors.VimeoIE._WORKING, "IE marked as not _WORKING") + @_skip("No output file specified") def test_Vimeo(self): - VimeoIE = youtube_dl.InfoExtractors.VimeoIE filename = '' fd = FileDownloader(self.parameters) - fd.add_info_extractor(VimeoIE()) + 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): - SoundcloudIE = youtube_dl.InfoExtractors.SoundcloudIE filename = 'n6FLbx6ZzMiu.mp3' fd = FileDownloader(self.parameters) - fd.add_info_extractor(SoundcloudIE()) + 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') + @_skip_unless(youtube_dl.InfoExtractors.StanfordOpenClassroomIE._WORKING, "IE marked as not _WORKING") def test_StanfordOpenClassroom(self): - StanfordOpenClassroomIE = youtube_dl.InfoExtractors.StanfordOpenClassroomIE filename = 'PracticalUnix_intro-environment.mp4' fd = FileDownloader(self.parameters) - fd.add_info_extractor(StanfordOpenClassroomIE()) + 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') - @unittest.skip("IE marked as not _WORKING") + @_skip_unless(youtube_dl.InfoExtractors.CollegeHumorIE._WORKING, "IE marked as not _WORKING") + @_skip("No output file specified") def test_CollegeHumor(self): - CollegeHumorIE = youtube_dl.InfoExtractors.CollegeHumorIE filename = '' fd = FileDownloader(self.parameters) - fd.add_info_extractor(CollegeHumorIE()) + 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): - XNXXIE = youtube_dl.InfoExtractors.XNXXIE filename = '1135332.flv' fd = FileDownloader(self.parameters) - fd.add_info_extractor(XNXXIE()) + 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) -- cgit v1.2.3 From 8af4ed7b4fb20190ec72e9ab6347e99deabe9bce Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 29 Nov 2012 16:35:57 +0100 Subject: Fix 2.6 nosetests --- test/gentests.py | 5 +++-- test/test_download.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/gentests.py b/test/gentests.py index da4e3c2f6..6f82ae8fa 100755 --- a/test/gentests.py +++ b/test/gentests.py @@ -52,13 +52,14 @@ try: except AttributeError: # Python 2.6 def _skip_unless(cond, reason='No reason given'): def resfunc(f): - def wfunc(*args, **kwargs): + # Start the function name with test to appease nosetests-2.6 + def test_wfunc(*args, **kwargs): if cond: return f(*args, **kwargs) else: print('Skipped test') return - return wfunc + return test_wfunc return resfunc _skip = lambda *args, **kwargs: _skip_unless(False, *args, **kwargs) diff --git a/test/test_download.py b/test/test_download.py index 0072d4aab..00b9a487b 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -38,13 +38,14 @@ try: except AttributeError: # Python 2.6 def _skip_unless(cond, reason='No reason given'): def resfunc(f): - def wfunc(*args, **kwargs): + # Start the function name with test to appease nosetests-2.6 + def test_wfunc(*args, **kwargs): if cond: return f(*args, **kwargs) else: print('Skipped test') return - return wfunc + return test_wfunc return resfunc _skip = lambda *args, **kwargs: _skip_unless(False, *args, **kwargs) -- cgit v1.2.3 From e91d2338d8f5be16d8cd052d38c20bec9d5583ab Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 29 Nov 2012 20:38:16 +0100 Subject: Fix MD5 calculation --- test/gentests.py | 13 ------------- test/test_download.py | 23 +++++------------------ test/tests.json | 10 +++++----- 3 files changed, 10 insertions(+), 36 deletions(-) (limited to 'test') diff --git a/test/gentests.py b/test/gentests.py index 6f82ae8fa..9352d6d94 100755 --- a/test/gentests.py +++ b/test/gentests.py @@ -34,19 +34,6 @@ 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 diff --git a/test/test_download.py b/test/test_download.py index 00b9a487b..571fbe9ad 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -20,19 +20,6 @@ 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 @@ -96,7 +83,7 @@ class DownloadTest(unittest.TestCase): 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): @@ -106,7 +93,7 @@ class DownloadTest(unittest.TestCase): 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") @@ -127,7 +114,7 @@ class DownloadTest(unittest.TestCase): 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): @@ -137,7 +124,7 @@ class DownloadTest(unittest.TestCase): 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") @@ -158,7 +145,7 @@ class DownloadTest(unittest.TestCase): 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): diff --git a/test/tests.json b/test/tests.json index 611780cc3..731c91718 100644 --- a/test/tests.json +++ b/test/tests.json @@ -20,13 +20,13 @@ }, { "name": "BlipTV", - "md5": "93c24d2f4e0782af13b8a7606ea97ba7", + "md5": "4962f94441605832eb1008eb820ef47a", "url": "http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352", "file": "5779306.m4v" }, { "name": "XVideos", - "md5": "1ab4dedc01f771cb2a65e91caa801aaf", + "md5": "aecab2ea59b7996110a7e409f0c55da3", "url": "http://www.xvideos.com/video939581/funny_porns_by_s_-1", "file": "939581.flv" }, @@ -38,13 +38,13 @@ }, { "name": "Soundcloud", - "md5": "ce3775768ebb6432fa8495d446a078ed", + "md5": "c1b9b9ea8bfd620b96b2628664576e1c", "url": "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy", "file": "n6FLbx6ZzMiu.mp3" }, { "name": "StanfordOpenClassroom", - "md5": "22c8206291368c4e2c9c1a307f0ea0f4", + "md5": "8aac7873a07dcfaed66b1559ab128514", "url": "http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100", "file": "PracticalUnix_intro-environment.mp4" }, @@ -56,7 +56,7 @@ }, { "name": "XNXX", - "md5": "5f0469c8d1dfd1bc38c8e6deb5e0a21d", + "md5": "c5c67df477eb0d9b058200351448ba4c", "url": "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_", "file": "1135332.flv" } -- cgit v1.2.3 From d78be7e331f3f859f770a37a33286d42680114e7 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Fri, 30 Nov 2012 08:42:11 +0100 Subject: Add test for Youku (Mentioned in #314) --- test/test_download.py | 12 ++++++++++++ test/tests.json | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index 571fbe9ad..c1f6ea556 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -147,6 +147,16 @@ class DownloadTest(unittest.TestCase): md5_for_file = _file_md5(filename) self.assertEqual(md5_for_file, 'c5c67df477eb0d9b058200351448ba4c') + @_skip_unless(youtube_dl.InfoExtractors.YoukuIE._WORKING, "IE marked as not _WORKING") + def test_Youku(self): + filename = 'XNDgyMDQ2NTQw_part00.flv' + fd = FileDownloader(self.parameters) + fd.add_info_extractor(youtube_dl.InfoExtractors.YoukuIE()) + fd.download(['http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html']) + self.assertTrue(os.path.exists(filename)) + md5_for_file = _file_md5(filename) + self.assertEqual(md5_for_file, 'ffe3f2e435663dc2d1eea34faeff5b5b') + def tearDown(self): if os.path.exists('BaW_jenozKc.mp4'): @@ -167,6 +177,8 @@ class DownloadTest(unittest.TestCase): # No file specified for CollegeHumor if os.path.exists('1135332.flv'): os.remove('1135332.flv') + if os.path.exists('XNDgyMDQ2NTQw_part00.flv'): + os.remove('XNDgyMDQ2NTQw_part00.flv') diff --git a/test/tests.json b/test/tests.json index 731c91718..b830cf36f 100644 --- a/test/tests.json +++ b/test/tests.json @@ -54,10 +54,16 @@ "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" + }, + { + "name": "Youku", + "url": "http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html", + "file": "XNDgyMDQ2NTQw_part00.flv", + "md5": "ffe3f2e435663dc2d1eea34faeff5b5b" } ] \ No newline at end of file -- cgit v1.2.3 From e575b6821ec185ef4f14c433ccc018d748c0fb60 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Sat, 1 Dec 2012 15:52:34 +0100 Subject: Improve execution tests --- test/test_execution.py | 26 ++++++++++++++++++++++++++ test/test_import.py | 13 ------------- 2 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 test/test_execution.py delete mode 100644 test/test_import.py (limited to 'test') diff --git a/test/test_execution.py b/test/test_execution.py new file mode 100644 index 000000000..2b115fb31 --- /dev/null +++ b/test/test_execution.py @@ -0,0 +1,26 @@ +import unittest + +import sys +import os +import subprocess + +rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + +try: + _DEV_NULL = subprocess.DEVNULL +except AttributeError: + _DEV_NULL = open(os.devnull, 'wb') + +class TestExecution(unittest.TestCase): + def test_import(self): + subprocess.check_call([sys.executable, '-c', 'import youtube_dl'], cwd=rootDir) + + def test_module_exec(self): + if sys.version_info >= (2,7): # Python 2.6 doesn't support package execution + subprocess.check_call([sys.executable, '-m', 'youtube_dl', '--version'], cwd=rootDir, stdout=_DEV_NULL) + + def test_main_exec(self): + subprocess.check_call([sys.executable, 'youtube_dl/__main__.py', '--version'], cwd=rootDir, stdout=_DEV_NULL) + +if __name__ == '__main__': + unittest.main() diff --git a/test/test_import.py b/test/test_import.py deleted file mode 100644 index acf95444d..000000000 --- a/test/test_import.py +++ /dev/null @@ -1,13 +0,0 @@ -import unittest - -import sys -import os.path -import subprocess - -class TestImport(unittest.TestCase): - def test_import(self): - rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - subprocess.check_call([sys.executable, '-c', 'import youtube_dl'], cwd=rootDir) - -if __name__ == '__main__': - unittest.main() -- cgit v1.2.3 From 796173d08b514182eedc704541eb55d5c9e1dc0d Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Mon, 3 Dec 2012 15:36:24 +0100 Subject: Keep video IDs verbatim if possible (Closes #571) --- test/test_utils.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'test') diff --git a/test/test_utils.py b/test/test_utils.py index fd8190f51..8afc30370 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -79,6 +79,11 @@ class TestUtil(unittest.TestCase): self.assertTrue(sanitize_filename('-', restricted=True) != '') self.assertTrue(sanitize_filename(':', restricted=True) != '') + def test_sanitize_ids(self): + self.assertEquals(sanitize_filename('_n_cd26wFpw', is_id=True), '_n_cd26wFpw') + self.assertEquals(sanitize_filename('_BD_eEpuzXw', is_id=True), '_BD_eEpuzXw') + self.assertEquals(sanitize_filename('N0Y__7-UOdI', is_id=True), 'N0Y__7-UOdI') + def test_ordered_set(self): self.assertEqual(orderedSet([1, 1, 2, 3, 4, 4, 5, 6, 7, 3, 5]), [1, 2, 3, 4, 5, 6, 7]) self.assertEqual(orderedSet([]), []) -- cgit v1.2.3 From 4083bf81a01f2e580f84f5db0274dd5585705ad6 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Mon, 3 Dec 2012 20:17:47 +0100 Subject: Correct metacafe test filename (happens to start with an underscore) --- test/test_download.py | 6 +++--- test/tests.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index c1f6ea556..fd7c1860c 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -67,7 +67,7 @@ class DownloadTest(unittest.TestCase): @_skip_unless(youtube_dl.InfoExtractors.MetacafeIE._WORKING, "IE marked as not _WORKING") def test_Metacafe(self): - filename = 'aUehQsCQtM.flv' + filename = '_aUehQsCQtM.flv' fd = FileDownloader(self.parameters) fd.add_info_extractor(youtube_dl.InfoExtractors.MetacafeIE()) fd.add_info_extractor(youtube_dl.InfoExtractors.YoutubeIE()) @@ -163,8 +163,8 @@ class DownloadTest(unittest.TestCase): 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('_aUehQsCQtM.flv'): + os.remove('_aUehQsCQtM.flv') if os.path.exists('5779306.m4v'): os.remove('5779306.m4v') if os.path.exists('939581.flv'): diff --git a/test/tests.json b/test/tests.json index b830cf36f..2c29a07b4 100644 --- a/test/tests.json +++ b/test/tests.json @@ -16,7 +16,7 @@ "size": 5754305, "addIEs": ["Youtube"], "url": "http://www.metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/", - "file": "aUehQsCQtM.flv" + "file": "_aUehQsCQtM.flv" }, { "name": "BlipTV", -- cgit v1.2.3 From e387eb5aba241e55e38e8bd5b57cc76b082ac6b9 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 4 Dec 2012 10:59:38 +0100 Subject: Let youtube IE handle IDs starting with PL (Closes #572) --- test/test_utils.py | 2 ++ test/test_youtube_playlist_ids.py | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 test/test_youtube_playlist_ids.py (limited to 'test') diff --git a/test/test_utils.py b/test/test_utils.py index 8afc30370..796ed4ab2 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + # Various small unit tests import sys diff --git a/test/test_youtube_playlist_ids.py b/test/test_youtube_playlist_ids.py new file mode 100644 index 000000000..b4dcedb45 --- /dev/null +++ b/test/test_youtube_playlist_ids.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python + +import sys +import unittest + +# Allow direct execution +import os +sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +from youtube_dl.InfoExtractors import YoutubeIE, YoutubePlaylistIE + +class TestYoutubePlaylistMatching(unittest.TestCase): + def test_playlist_matching(self): + assert YoutubePlaylistIE().suitable(u'ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8') + assert YoutubePlaylistIE().suitable(u'PL63F0C78739B09958') + assert not YoutubePlaylistIE().suitable(u'PLtS2H6bU1M') + + def test_youtube_matching(self): + assert YoutubeIE().suitable(u'PLtS2H6bU1M') + +if __name__ == '__main__': + unittest.main() -- cgit v1.2.3 From 863baa16eca7a98c38fb29c5e54f76df224f2351 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Fri, 7 Dec 2012 01:34:40 +0100 Subject: SoundCloud IDs have changed, fix tests --- test/test_download.py | 6 +++--- test/tests.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index fd7c1860c..6926dd04e 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -108,7 +108,7 @@ class DownloadTest(unittest.TestCase): @_skip_unless(youtube_dl.InfoExtractors.SoundcloudIE._WORKING, "IE marked as not _WORKING") def test_Soundcloud(self): - filename = 'n6FLbx6ZzMiu.mp3' + filename = '62986583.mp3' fd = FileDownloader(self.parameters) fd.add_info_extractor(youtube_dl.InfoExtractors.SoundcloudIE()) fd.download(['http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy']) @@ -170,8 +170,8 @@ class DownloadTest(unittest.TestCase): 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('62986583.mp3'): + os.remove('62986583.mp3') if os.path.exists('PracticalUnix_intro-environment.mp4'): os.remove('PracticalUnix_intro-environment.mp4') # No file specified for CollegeHumor diff --git a/test/tests.json b/test/tests.json index 2c29a07b4..cb29f2053 100644 --- a/test/tests.json +++ b/test/tests.json @@ -40,7 +40,7 @@ "name": "Soundcloud", "md5": "c1b9b9ea8bfd620b96b2628664576e1c", "url": "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy", - "file": "n6FLbx6ZzMiu.mp3" + "file": "62986583.mp3" }, { "name": "StanfordOpenClassroom", @@ -66,4 +66,4 @@ "file": "XNDgyMDQ2NTQw_part00.flv", "md5": "ffe3f2e435663dc2d1eea34faeff5b5b" } -] \ No newline at end of file +] -- cgit v1.2.3 From 1ca63e3ae3f7f61a9c38e04eec421faa42a1faee Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Tue, 11 Dec 2012 11:33:15 +0100 Subject: the test didn't load our Gzip opener this was blocking the Vimeo test + some more gentest fixes --- test/gentests.py | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/gentests.py b/test/gentests.py index 9352d6d94..a20b139f5 100755 --- a/test/gentests.py +++ b/test/gentests.py @@ -23,13 +23,28 @@ import os import json import unittest import sys +import socket # 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.FileDownloader import youtube_dl.InfoExtractors +from youtube_dl.utils import * + +# General configuration (from __init__, not very elegant...) +jar = compat_cookiejar.CookieJar() +cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar) +proxy_handler = compat_urllib_request.ProxyHandler() +opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler()) +compat_urllib_request.install_opener(opener) +socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words) + +class FileDownloader(youtube_dl.FileDownloader): + def __init__(self, *args, **kwargs): + youtube_dl.FileDownloader.__init__(self, *args, **kwargs) + self.to_stderr = self.to_screen def _file_md5(fn): with open(fn, 'rb') as f: @@ -76,12 +91,12 @@ def gentests(): with io.open(TEST_FILE, 'w', encoding='utf-8') as testf: testf.write(HEADER) spaces = ' ' * 4 - write = lambda l: testf.write(spaces + l + '\n') + write = lambda l: testf.write(spaces + l + u'\n') for d in defs: name = d['name'] ie = getattr(youtube_dl.InfoExtractors, name + 'IE') - testf.write('\n') + testf.write(u'\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")') @@ -101,7 +116,7 @@ def gentests(): write(' md5_for_file = _file_md5(filename)') write(' self.assertEqual(md5_for_file, ' + repr(d['md5']) + ')') - testf.write('\n\n') + testf.write(u'\n\n') write('def tearDown(self):') for d in defs: if d['file']: @@ -109,7 +124,7 @@ def gentests(): write(' os.remove(' + repr(d['file']) + ')') else: write(' # No file specified for ' + d['name']) - testf.write('\n') + testf.write(u'\n') testf.write(FOOTER) if __name__ == '__main__': -- cgit v1.2.3 From d3d31998705fd8d850d07d69933c9ed07257e95f Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Tue, 11 Dec 2012 12:09:22 +0100 Subject: gentests: allow test-specific FileDownloader params override from tests.json --- test/gentests.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/gentests.py b/test/gentests.py index a20b139f5..ee9092f33 100755 --- a/test/gentests.py +++ b/test/gentests.py @@ -104,7 +104,10 @@ def gentests(): write('@_skip(' + repr(d['skip']) + ')') write('def test_' + name + '(self):') write(' filename = ' + repr(d['file'])) - write(' fd = FileDownloader(self.parameters)') + write(' params = self.parameters') + for p in d.get('params', {}): + write(' params["' + p + '"] = ' + repr(d['params'][p])) + write(' fd = FileDownloader(params)') 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())') -- cgit v1.2.3 From 4fb1acc212555e3e817f858dce964876eef75d85 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Tue, 11 Dec 2012 12:12:02 +0100 Subject: use the new --test option to speed up tests (fetch only first 10K) now all tests working and passing --- test/gentests.py | 2 - test/parameters.json | 41 ++++++++++++- test/test_download.py | 158 +++++++++++++++++++++++++++----------------------- test/tests.json | 27 ++++----- 4 files changed, 135 insertions(+), 93 deletions(-) (limited to 'test') diff --git a/test/gentests.py b/test/gentests.py index ee9092f33..0ea5d9f21 100755 --- a/test/gentests.py +++ b/test/gentests.py @@ -113,8 +113,6 @@ def gentests(): 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']) + ')') diff --git a/test/parameters.json b/test/parameters.json index cc2b017eb..c2082df10 100644 --- a/test/parameters.json +++ b/test/parameters.json @@ -1 +1,40 @@ -{"username": null, "listformats": null, "skip_download": false, "usenetrc": false, "max_downloads": null, "noprogress": false, "forcethumbnail": false, "forceformat": false, "format_limit": null, "ratelimit": null, "nooverwrites": false, "forceurl": false, "writeinfojson": false, "simulate": false, "playliststart": 1, "continuedl": true, "password": null, "prefer_free_formats": false, "nopart": false, "retries": 10, "updatetime": true, "consoletitle": false, "verbose": true, "forcefilename": false, "ignoreerrors": false, "logtostderr": false, "format": null, "subtitleslang": null, "quiet": false, "outtmpl": "%(id)s.%(ext)s", "rejecttitle": null, "playlistend": -1, "writedescription": false, "forcetitle": false, "forcedescription": false, "writesubtitles": false, "matchtitle": null} \ No newline at end of file +{ + "consoletitle": false, + "continuedl": true, + "forcedescription": false, + "forcefilename": false, + "forceformat": false, + "forcethumbnail": false, + "forcetitle": false, + "forceurl": false, + "format": null, + "format_limit": null, + "ignoreerrors": false, + "listformats": null, + "logtostderr": false, + "matchtitle": null, + "max_downloads": null, + "nooverwrites": false, + "nopart": false, + "noprogress": false, + "outtmpl": "%(id)s.%(ext)s", + "password": null, + "playlistend": -1, + "playliststart": 1, + "prefer_free_formats": false, + "quiet": false, + "ratelimit": null, + "rejecttitle": null, + "retries": 10, + "simulate": false, + "skip_download": false, + "subtitleslang": null, + "test": true, + "updatetime": true, + "usenetrc": false, + "username": null, + "verbose": true, + "writedescription": false, + "writeinfojson": false, + "writesubtitles": false +} \ No newline at end of file diff --git a/test/test_download.py b/test/test_download.py index 6926dd04e..f45c500c8 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -9,13 +9,28 @@ import os import json import unittest import sys +import socket # 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.FileDownloader import youtube_dl.InfoExtractors +from youtube_dl.utils import * + +# General configuration (from __init__, not very elegant...) +jar = compat_cookiejar.CookieJar() +cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar) +proxy_handler = compat_urllib_request.ProxyHandler() +opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler()) +compat_urllib_request.install_opener(opener) +socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words) + +class FileDownloader(youtube_dl.FileDownloader): + def __init__(self, *args, **kwargs): + youtube_dl.FileDownloader.__init__(self, *args, **kwargs) + self.to_stderr = self.to_screen def _file_md5(fn): with open(fn, 'rb') as f: @@ -48,137 +63,134 @@ class DownloadTest(unittest.TestCase): @_skip_unless(youtube_dl.InfoExtractors.YoutubeIE._WORKING, "IE marked as not _WORKING") def test_Youtube(self): - filename = 'BaW_jenozKc.mp4' - fd = FileDownloader(self.parameters) + filename = u'BaW_jenozKc.mp4' + params = self.parameters + fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.YoutubeIE()) - fd.download(['http://www.youtube.com/watch?v=BaW_jenozKc']) + fd.download([u'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) + filename = u'x33vw9.mp4' + params = self.parameters + fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.DailymotionIE()) - fd.download(['http://www.dailymotion.com/video/x33vw9_tutoriel-de-youtubeur-dl-des-video_tech']) + fd.download([u'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') + self.assertEqual(md5_for_file, u'392c4b85a60a90dc4792da41ce3144eb') @_skip_unless(youtube_dl.InfoExtractors.MetacafeIE._WORKING, "IE marked as not _WORKING") def test_Metacafe(self): - filename = '_aUehQsCQtM.flv' - fd = FileDownloader(self.parameters) + filename = u'_aUehQsCQtM.flv' + params = self.parameters + fd = FileDownloader(params) 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/']) + fd.download([u'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) + filename = u'5779306.m4v' + params = self.parameters + fd = FileDownloader(params) 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']) + fd.download([u'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, '4962f94441605832eb1008eb820ef47a') + self.assertEqual(md5_for_file, u'b2d849efcf7ee18917e4b4d9ff37cafe') @_skip_unless(youtube_dl.InfoExtractors.XVideosIE._WORKING, "IE marked as not _WORKING") def test_XVideos(self): - filename = '939581.flv' - fd = FileDownloader(self.parameters) + filename = u'939581.flv' + params = self.parameters + fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.XVideosIE()) - fd.download(['http://www.xvideos.com/video939581/funny_porns_by_s_-1']) + fd.download([u'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, 'aecab2ea59b7996110a7e409f0c55da3') + self.assertEqual(md5_for_file, u'1d0c835822f0a71a7bf011855db929d0') @_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) + filename = u'14160053.mp4' + params = self.parameters + fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.VimeoIE()) - fd.download(['http://vimeo.com/14160053']) + fd.download([u'http://vimeo.com/14160053']) self.assertTrue(os.path.exists(filename)) md5_for_file = _file_md5(filename) - self.assertEqual(md5_for_file, '1ab4dedc01f771cb2a65e91caa801aaf') + self.assertEqual(md5_for_file, u'60540a4ec7cc378ec84b919c0aed5023') @_skip_unless(youtube_dl.InfoExtractors.SoundcloudIE._WORKING, "IE marked as not _WORKING") def test_Soundcloud(self): - filename = '62986583.mp3' - fd = FileDownloader(self.parameters) + filename = u'62986583.mp3' + params = self.parameters + fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.SoundcloudIE()) - fd.download(['http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy']) + fd.download([u'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, 'c1b9b9ea8bfd620b96b2628664576e1c') + self.assertEqual(md5_for_file, u'ebef0a451b909710ed1d7787dddbf0d7') @_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) + filename = u'PracticalUnix_intro-environment.mp4' + params = self.parameters + fd = FileDownloader(params) 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, '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']) + fd.download([u'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, '') + self.assertEqual(md5_for_file, u'544a9468546059d4e80d76265b0443b8') @_skip_unless(youtube_dl.InfoExtractors.XNXXIE._WORKING, "IE marked as not _WORKING") def test_XNXX(self): - filename = '1135332.flv' - fd = FileDownloader(self.parameters) + filename = u'1135332.flv' + params = self.parameters + fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.XNXXIE()) - fd.download(['http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_']) + fd.download([u'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, 'c5c67df477eb0d9b058200351448ba4c') + self.assertEqual(md5_for_file, u'0831677e2b4761795f68d417e0b7b445') @_skip_unless(youtube_dl.InfoExtractors.YoukuIE._WORKING, "IE marked as not _WORKING") def test_Youku(self): - filename = 'XNDgyMDQ2NTQw_part00.flv' - fd = FileDownloader(self.parameters) + filename = u'XNDgyMDQ2NTQw_part00.flv' + params = self.parameters + params["test"] = False + fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.YoukuIE()) - fd.download(['http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html']) + fd.download([u'http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html']) self.assertTrue(os.path.exists(filename)) md5_for_file = _file_md5(filename) - self.assertEqual(md5_for_file, 'ffe3f2e435663dc2d1eea34faeff5b5b') + self.assertEqual(md5_for_file, u'ffe3f2e435663dc2d1eea34faeff5b5b') 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('62986583.mp3'): - os.remove('62986583.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 os.path.exists('XNDgyMDQ2NTQw_part00.flv'): - os.remove('XNDgyMDQ2NTQw_part00.flv') + if os.path.exists(u'BaW_jenozKc.mp4'): + os.remove(u'BaW_jenozKc.mp4') + if os.path.exists(u'x33vw9.mp4'): + os.remove(u'x33vw9.mp4') + if os.path.exists(u'_aUehQsCQtM.flv'): + os.remove(u'_aUehQsCQtM.flv') + if os.path.exists(u'5779306.m4v'): + os.remove(u'5779306.m4v') + if os.path.exists(u'939581.flv'): + os.remove(u'939581.flv') + if os.path.exists(u'14160053.mp4'): + os.remove(u'14160053.mp4') + if os.path.exists(u'62986583.mp3'): + os.remove(u'62986583.mp3') + if os.path.exists(u'PracticalUnix_intro-environment.mp4'): + os.remove(u'PracticalUnix_intro-environment.mp4') + if os.path.exists(u'1135332.flv'): + os.remove(u'1135332.flv') + if os.path.exists(u'XNDgyMDQ2NTQw_part00.flv'): + os.remove(u'XNDgyMDQ2NTQw_part00.flv') diff --git a/test/tests.json b/test/tests.json index cb29f2053..34992a321 100644 --- a/test/tests.json +++ b/test/tests.json @@ -1,62 +1,54 @@ [ { "name": "Youtube", - "size": 1993883, "url": "http://www.youtube.com/watch?v=BaW_jenozKc", "file": "BaW_jenozKc.mp4" }, { "name": "Dailymotion", - "md5": "d363a50e9eb4f22ce90d08d15695bb47", + "md5": "392c4b85a60a90dc4792da41ce3144eb", "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": "4962f94441605832eb1008eb820ef47a", + "md5": "b2d849efcf7ee18917e4b4d9ff37cafe", "url": "http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352", "file": "5779306.m4v" }, { "name": "XVideos", - "md5": "aecab2ea59b7996110a7e409f0c55da3", + "md5": "1d0c835822f0a71a7bf011855db929d0", "url": "http://www.xvideos.com/video939581/funny_porns_by_s_-1", "file": "939581.flv" }, { "name": "Vimeo", - "md5": "1ab4dedc01f771cb2a65e91caa801aaf", + "md5": "60540a4ec7cc378ec84b919c0aed5023", "url": "http://vimeo.com/14160053", - "file": "" + "file": "14160053.mp4" }, { "name": "Soundcloud", - "md5": "c1b9b9ea8bfd620b96b2628664576e1c", + "md5": "ebef0a451b909710ed1d7787dddbf0d7", "url": "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy", "file": "62986583.mp3" }, { "name": "StanfordOpenClassroom", - "md5": "8aac7873a07dcfaed66b1559ab128514", + "md5": "544a9468546059d4e80d76265b0443b8", "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", + "md5": "0831677e2b4761795f68d417e0b7b445", "url": "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_", "file": "1135332.flv" }, @@ -64,6 +56,7 @@ "name": "Youku", "url": "http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html", "file": "XNDgyMDQ2NTQw_part00.flv", - "md5": "ffe3f2e435663dc2d1eea34faeff5b5b" + "md5": "ffe3f2e435663dc2d1eea34faeff5b5b", + "params": { "test": false } } ] -- cgit v1.2.3 From 9789a05c20d5f29cb93c371eaaa1c2a291297fb5 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Tue, 11 Dec 2012 16:45:46 +0100 Subject: fix playlist pagination and add YT playlist tests (closes #569) --- test/test_youtube_lists.py | 70 +++++++++++++++++++++++++++++++++++++++ test/test_youtube_playlist_ids.py | 8 ++--- 2 files changed, 74 insertions(+), 4 deletions(-) create mode 100644 test/test_youtube_lists.py (limited to 'test') diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py new file mode 100644 index 000000000..a11a59ed7 --- /dev/null +++ b/test/test_youtube_lists.py @@ -0,0 +1,70 @@ +#!/usr/bin/env python + +import sys +import unittest +import socket + +# Allow direct execution +import os +sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +from youtube_dl.InfoExtractors import YoutubePlaylistIE +from youtube_dl.utils import * + +# General configuration (from __init__, not very elegant...) +jar = compat_cookiejar.CookieJar() +cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar) +proxy_handler = compat_urllib_request.ProxyHandler() +opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler()) +compat_urllib_request.install_opener(opener) +socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words) + +class FakeDownloader(object): + def __init__(self): + self.result = [] + self.params = {} + def to_screen(self, s): + print(s) + def trouble(self, s): + raise Exception(s) + def download(self, x): + self.result.append(x) + +class TestYoutubeLists(unittest.TestCase): + def test_youtube_playlist(self): + DL = FakeDownloader() + IE = YoutubePlaylistIE(DL) + IE.extract('https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re') + self.assertEqual(DL.result, [ + ['http://www.youtube.com/watch?v=bV9L5Ht9LgY'], + ['http://www.youtube.com/watch?v=FXxLjLQi3Fg'], + ['http://www.youtube.com/watch?v=tU3Bgo5qJZE'] + ]) + + def test_youtube_playlist_long(self): + DL = FakeDownloader() + IE = YoutubePlaylistIE(DL) + IE.extract('https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q') + self.assertTrue(len(DL.result) >= 799) + + def test_youtube_course(self): + DL = FakeDownloader() + IE = YoutubePlaylistIE(DL) + # TODO find a > 100 (paginating?) videos course + IE.extract('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8') + self.assertEqual(DL.result[0], ['http://www.youtube.com/watch?v=j9WZyLZCBzs']) + self.assertEqual(len(DL.result), 25) + self.assertEqual(DL.result[-1], ['http://www.youtube.com/watch?v=rYefUsYuEp0']) + + def test_youtube_channel(self): + """I give up, please find a channel that does paginate and test this like test_youtube_playlist_long""" + pass # TODO + + def test_youtube_user(self): + DL = FakeDownloader() + IE = YoutubePlaylistIE(DL) + IE.extract('https://www.youtube.com/user/TheLinuxFoundation') + self.assertTrue(len(DL.result) >= 320) + +if __name__ == '__main__': + unittest.main() diff --git a/test/test_youtube_playlist_ids.py b/test/test_youtube_playlist_ids.py index b4dcedb45..2eeb3216c 100644 --- a/test/test_youtube_playlist_ids.py +++ b/test/test_youtube_playlist_ids.py @@ -11,12 +11,12 @@ from youtube_dl.InfoExtractors import YoutubeIE, YoutubePlaylistIE class TestYoutubePlaylistMatching(unittest.TestCase): def test_playlist_matching(self): - assert YoutubePlaylistIE().suitable(u'ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8') - assert YoutubePlaylistIE().suitable(u'PL63F0C78739B09958') - assert not YoutubePlaylistIE().suitable(u'PLtS2H6bU1M') + self.assertTrue(YoutubePlaylistIE().suitable(u'ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')) + self.assertTrue(YoutubePlaylistIE().suitable(u'PL63F0C78739B09958')) + self.assertFalse(YoutubePlaylistIE().suitable(u'PLtS2H6bU1M')) def test_youtube_matching(self): - assert YoutubeIE().suitable(u'PLtS2H6bU1M') + self.assertTrue(YoutubeIE().suitable(u'PLtS2H6bU1M')) if __name__ == '__main__': unittest.main() -- cgit v1.2.3 From 9a6f4429a08a4bb7e6a92cf74d0b7451a5e9e03f Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 11 Dec 2012 18:03:22 +0100 Subject: Fix test selection in Python 2.6 --- test/gentests.py | 1 + test/test_download.py | 97 ++++++++++++++++++++++++++------------------------- 2 files changed, 50 insertions(+), 48 deletions(-) (limited to 'test') diff --git a/test/gentests.py b/test/gentests.py index 0ea5d9f21..4cc9875ea 100755 --- a/test/gentests.py +++ b/test/gentests.py @@ -61,6 +61,7 @@ except AttributeError: # Python 2.6 else: print('Skipped test') return + test_wfunc.__name__ = f.__name__ return test_wfunc return resfunc _skip = lambda *args, **kwargs: _skip_unless(False, *args, **kwargs) diff --git a/test/test_download.py b/test/test_download.py index f45c500c8..42594914b 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -47,6 +47,7 @@ except AttributeError: # Python 2.6 else: print('Skipped test') return + test_wfunc.__name__ = f.__name__ return test_wfunc return resfunc _skip = lambda *args, **kwargs: _skip_unless(False, *args, **kwargs) @@ -63,134 +64,134 @@ class DownloadTest(unittest.TestCase): @_skip_unless(youtube_dl.InfoExtractors.YoutubeIE._WORKING, "IE marked as not _WORKING") def test_Youtube(self): - filename = u'BaW_jenozKc.mp4' + filename = 'BaW_jenozKc.mp4' params = self.parameters fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.YoutubeIE()) - fd.download([u'http://www.youtube.com/watch?v=BaW_jenozKc']) + fd.download(['http://www.youtube.com/watch?v=BaW_jenozKc']) self.assertTrue(os.path.exists(filename)) @_skip_unless(youtube_dl.InfoExtractors.DailymotionIE._WORKING, "IE marked as not _WORKING") def test_Dailymotion(self): - filename = u'x33vw9.mp4' + filename = 'x33vw9.mp4' params = self.parameters fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.DailymotionIE()) - fd.download([u'http://www.dailymotion.com/video/x33vw9_tutoriel-de-youtubeur-dl-des-video_tech']) + 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, u'392c4b85a60a90dc4792da41ce3144eb') + self.assertEqual(md5_for_file, '392c4b85a60a90dc4792da41ce3144eb') @_skip_unless(youtube_dl.InfoExtractors.MetacafeIE._WORKING, "IE marked as not _WORKING") def test_Metacafe(self): - filename = u'_aUehQsCQtM.flv' + filename = '_aUehQsCQtM.flv' params = self.parameters fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.MetacafeIE()) fd.add_info_extractor(youtube_dl.InfoExtractors.YoutubeIE()) - fd.download([u'http://www.metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/']) + fd.download(['http://www.metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/']) self.assertTrue(os.path.exists(filename)) @_skip_unless(youtube_dl.InfoExtractors.BlipTVIE._WORKING, "IE marked as not _WORKING") def test_BlipTV(self): - filename = u'5779306.m4v' + filename = '5779306.m4v' params = self.parameters fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.BlipTVIE()) - fd.download([u'http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352']) + 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, u'b2d849efcf7ee18917e4b4d9ff37cafe') + self.assertEqual(md5_for_file, 'b2d849efcf7ee18917e4b4d9ff37cafe') @_skip_unless(youtube_dl.InfoExtractors.XVideosIE._WORKING, "IE marked as not _WORKING") def test_XVideos(self): - filename = u'939581.flv' + filename = '939581.flv' params = self.parameters fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.XVideosIE()) - fd.download([u'http://www.xvideos.com/video939581/funny_porns_by_s_-1']) + 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, u'1d0c835822f0a71a7bf011855db929d0') + self.assertEqual(md5_for_file, '1d0c835822f0a71a7bf011855db929d0') @_skip_unless(youtube_dl.InfoExtractors.VimeoIE._WORKING, "IE marked as not _WORKING") def test_Vimeo(self): - filename = u'14160053.mp4' + filename = '14160053.mp4' params = self.parameters fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.VimeoIE()) - fd.download([u'http://vimeo.com/14160053']) + fd.download(['http://vimeo.com/14160053']) self.assertTrue(os.path.exists(filename)) md5_for_file = _file_md5(filename) - self.assertEqual(md5_for_file, u'60540a4ec7cc378ec84b919c0aed5023') + self.assertEqual(md5_for_file, '60540a4ec7cc378ec84b919c0aed5023') @_skip_unless(youtube_dl.InfoExtractors.SoundcloudIE._WORKING, "IE marked as not _WORKING") def test_Soundcloud(self): - filename = u'62986583.mp3' + filename = '62986583.mp3' params = self.parameters fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.SoundcloudIE()) - fd.download([u'http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy']) + 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, u'ebef0a451b909710ed1d7787dddbf0d7') + self.assertEqual(md5_for_file, 'ebef0a451b909710ed1d7787dddbf0d7') @_skip_unless(youtube_dl.InfoExtractors.StanfordOpenClassroomIE._WORKING, "IE marked as not _WORKING") def test_StanfordOpenClassroom(self): - filename = u'PracticalUnix_intro-environment.mp4' + filename = 'PracticalUnix_intro-environment.mp4' params = self.parameters fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.StanfordOpenClassroomIE()) - fd.download([u'http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100']) + 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, u'544a9468546059d4e80d76265b0443b8') + self.assertEqual(md5_for_file, '544a9468546059d4e80d76265b0443b8') @_skip_unless(youtube_dl.InfoExtractors.XNXXIE._WORKING, "IE marked as not _WORKING") def test_XNXX(self): - filename = u'1135332.flv' + filename = '1135332.flv' params = self.parameters fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.XNXXIE()) - fd.download([u'http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_']) + 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, u'0831677e2b4761795f68d417e0b7b445') + self.assertEqual(md5_for_file, '0831677e2b4761795f68d417e0b7b445') @_skip_unless(youtube_dl.InfoExtractors.YoukuIE._WORKING, "IE marked as not _WORKING") def test_Youku(self): - filename = u'XNDgyMDQ2NTQw_part00.flv' + filename = 'XNDgyMDQ2NTQw_part00.flv' params = self.parameters params["test"] = False fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.YoukuIE()) - fd.download([u'http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html']) + fd.download(['http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html']) self.assertTrue(os.path.exists(filename)) md5_for_file = _file_md5(filename) - self.assertEqual(md5_for_file, u'ffe3f2e435663dc2d1eea34faeff5b5b') + self.assertEqual(md5_for_file, 'ffe3f2e435663dc2d1eea34faeff5b5b') def tearDown(self): - if os.path.exists(u'BaW_jenozKc.mp4'): - os.remove(u'BaW_jenozKc.mp4') - if os.path.exists(u'x33vw9.mp4'): - os.remove(u'x33vw9.mp4') - if os.path.exists(u'_aUehQsCQtM.flv'): - os.remove(u'_aUehQsCQtM.flv') - if os.path.exists(u'5779306.m4v'): - os.remove(u'5779306.m4v') - if os.path.exists(u'939581.flv'): - os.remove(u'939581.flv') - if os.path.exists(u'14160053.mp4'): - os.remove(u'14160053.mp4') - if os.path.exists(u'62986583.mp3'): - os.remove(u'62986583.mp3') - if os.path.exists(u'PracticalUnix_intro-environment.mp4'): - os.remove(u'PracticalUnix_intro-environment.mp4') - if os.path.exists(u'1135332.flv'): - os.remove(u'1135332.flv') - if os.path.exists(u'XNDgyMDQ2NTQw_part00.flv'): - os.remove(u'XNDgyMDQ2NTQw_part00.flv') + 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') + if os.path.exists('14160053.mp4'): + os.remove('14160053.mp4') + if os.path.exists('62986583.mp3'): + os.remove('62986583.mp3') + if os.path.exists('PracticalUnix_intro-environment.mp4'): + os.remove('PracticalUnix_intro-environment.mp4') + if os.path.exists('1135332.flv'): + os.remove('1135332.flv') + if os.path.exists('XNDgyMDQ2NTQw_part00.flv'): + os.remove('XNDgyMDQ2NTQw_part00.flv') -- cgit v1.2.3 From 2c6945be30511f633b3544838692894802e8c9bd Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 11 Dec 2012 18:07:38 +0100 Subject: Fix TestYoutubeLists.test_youtube_user --- test/test_youtube_lists.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py index a11a59ed7..8939a5259 100644 --- a/test/test_youtube_lists.py +++ b/test/test_youtube_lists.py @@ -8,7 +8,7 @@ import socket import os sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dl.InfoExtractors import YoutubePlaylistIE +from youtube_dl.InfoExtractors import YoutubeUserIE,YoutubePlaylistIE from youtube_dl.utils import * # General configuration (from __init__, not very elegant...) @@ -62,7 +62,7 @@ class TestYoutubeLists(unittest.TestCase): def test_youtube_user(self): DL = FakeDownloader() - IE = YoutubePlaylistIE(DL) + IE = YoutubeUserIE(DL) IE.extract('https://www.youtube.com/user/TheLinuxFoundation') self.assertTrue(len(DL.result) >= 320) -- cgit v1.2.3 From 1535ac2ae930104b67939a628411d3f5ab023571 Mon Sep 17 00:00:00 2001 From: gcmalloc Date: Wed, 12 Dec 2012 03:55:06 +0100 Subject: test automation --- test/gentests.py | 132 -------------------------- test/test_download.py | 251 +++++++++++++------------------------------------- test/tests.json | 4 +- 3 files changed, 65 insertions(+), 322 deletions(-) delete mode 100755 test/gentests.py (limited to 'test') diff --git a/test/gentests.py b/test/gentests.py deleted file mode 100755 index 0ea5d9f21..000000000 --- a/test/gentests.py +++ /dev/null @@ -1,132 +0,0 @@ -#!/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 -import socket - -# Allow direct execution -import os -sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) - -import youtube_dl.FileDownloader -import youtube_dl.InfoExtractors -from youtube_dl.utils import * - -# General configuration (from __init__, not very elegant...) -jar = compat_cookiejar.CookieJar() -cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar) -proxy_handler = compat_urllib_request.ProxyHandler() -opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler()) -compat_urllib_request.install_opener(opener) -socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words) - -class FileDownloader(youtube_dl.FileDownloader): - def __init__(self, *args, **kwargs): - youtube_dl.FileDownloader.__init__(self, *args, **kwargs) - self.to_stderr = self.to_screen - -def _file_md5(fn): - with open(fn, 'rb') as f: - return hashlib.md5(f.read()).hexdigest() -try: - _skip_unless = unittest.skipUnless -except AttributeError: # Python 2.6 - def _skip_unless(cond, reason='No reason given'): - def resfunc(f): - # Start the function name with test to appease nosetests-2.6 - def test_wfunc(*args, **kwargs): - if cond: - return f(*args, **kwargs) - else: - print('Skipped test') - return - return test_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 + u'\n') - - for d in defs: - name = d['name'] - ie = getattr(youtube_dl.InfoExtractors, name + 'IE') - testf.write(u'\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(' params = self.parameters') - for p in d.get('params', {}): - write(' params["' + p + '"] = ' + repr(d['params'][p])) - write(' fd = FileDownloader(params)') - 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 'md5' in d: - write(' md5_for_file = _file_md5(filename)') - write(' self.assertEqual(md5_for_file, ' + repr(d['md5']) + ')') - - testf.write(u'\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(u'\n') - testf.write(FOOTER) - -if __name__ == '__main__': - gentests() diff --git a/test/test_download.py b/test/test_download.py index f45c500c8..be15fb5ab 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -1,197 +1,72 @@ -#!/usr/bin/env python - -# DO NOT EDIT THIS FILE BY HAND! -# It is auto-generated from tests.json and gentests.py. - +#!/usr/bin/env python2 import hashlib -import io import os import json import unittest import sys -import socket - -# Allow direct execution -import os -sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) - -import youtube_dl.FileDownloader -import youtube_dl.InfoExtractors -from youtube_dl.utils import * - -# General configuration (from __init__, not very elegant...) -jar = compat_cookiejar.CookieJar() -cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar) -proxy_handler = compat_urllib_request.ProxyHandler() -opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler()) -compat_urllib_request.install_opener(opener) -socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words) - -class FileDownloader(youtube_dl.FileDownloader): - def __init__(self, *args, **kwargs): - youtube_dl.FileDownloader.__init__(self, *args, **kwargs) - self.to_stderr = self.to_screen - -def _file_md5(fn): - with open(fn, 'rb') as f: - return hashlib.md5(f.read()).hexdigest() -try: - _skip_unless = unittest.skipUnless -except AttributeError: # Python 2.6 - def _skip_unless(cond, reason='No reason given'): - def resfunc(f): - # Start the function name with test to appease nosetests-2.6 - def test_wfunc(*args, **kwargs): - if cond: - return f(*args, **kwargs) - else: - print('Skipped test') - return - return test_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 = u'BaW_jenozKc.mp4' - params = self.parameters - fd = FileDownloader(params) - fd.add_info_extractor(youtube_dl.InfoExtractors.YoutubeIE()) - fd.download([u'http://www.youtube.com/watch?v=BaW_jenozKc']) - self.assertTrue(os.path.exists(filename)) - - @_skip_unless(youtube_dl.InfoExtractors.DailymotionIE._WORKING, "IE marked as not _WORKING") - def test_Dailymotion(self): - filename = u'x33vw9.mp4' - params = self.parameters - fd = FileDownloader(params) - fd.add_info_extractor(youtube_dl.InfoExtractors.DailymotionIE()) - fd.download([u'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, u'392c4b85a60a90dc4792da41ce3144eb') - - @_skip_unless(youtube_dl.InfoExtractors.MetacafeIE._WORKING, "IE marked as not _WORKING") - def test_Metacafe(self): - filename = u'_aUehQsCQtM.flv' - params = self.parameters - fd = FileDownloader(params) - fd.add_info_extractor(youtube_dl.InfoExtractors.MetacafeIE()) - fd.add_info_extractor(youtube_dl.InfoExtractors.YoutubeIE()) - fd.download([u'http://www.metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/']) - self.assertTrue(os.path.exists(filename)) - - @_skip_unless(youtube_dl.InfoExtractors.BlipTVIE._WORKING, "IE marked as not _WORKING") - def test_BlipTV(self): - filename = u'5779306.m4v' - params = self.parameters - fd = FileDownloader(params) - fd.add_info_extractor(youtube_dl.InfoExtractors.BlipTVIE()) - fd.download([u'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, u'b2d849efcf7ee18917e4b4d9ff37cafe') - - @_skip_unless(youtube_dl.InfoExtractors.XVideosIE._WORKING, "IE marked as not _WORKING") - def test_XVideos(self): - filename = u'939581.flv' - params = self.parameters - fd = FileDownloader(params) - fd.add_info_extractor(youtube_dl.InfoExtractors.XVideosIE()) - fd.download([u'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, u'1d0c835822f0a71a7bf011855db929d0') - - @_skip_unless(youtube_dl.InfoExtractors.VimeoIE._WORKING, "IE marked as not _WORKING") - def test_Vimeo(self): - filename = u'14160053.mp4' - params = self.parameters - fd = FileDownloader(params) - fd.add_info_extractor(youtube_dl.InfoExtractors.VimeoIE()) - fd.download([u'http://vimeo.com/14160053']) - self.assertTrue(os.path.exists(filename)) - md5_for_file = _file_md5(filename) - self.assertEqual(md5_for_file, u'60540a4ec7cc378ec84b919c0aed5023') - - @_skip_unless(youtube_dl.InfoExtractors.SoundcloudIE._WORKING, "IE marked as not _WORKING") - def test_Soundcloud(self): - filename = u'62986583.mp3' - params = self.parameters - fd = FileDownloader(params) - fd.add_info_extractor(youtube_dl.InfoExtractors.SoundcloudIE()) - fd.download([u'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, u'ebef0a451b909710ed1d7787dddbf0d7') - - @_skip_unless(youtube_dl.InfoExtractors.StanfordOpenClassroomIE._WORKING, "IE marked as not _WORKING") - def test_StanfordOpenClassroom(self): - filename = u'PracticalUnix_intro-environment.mp4' - params = self.parameters - fd = FileDownloader(params) - fd.add_info_extractor(youtube_dl.InfoExtractors.StanfordOpenClassroomIE()) - fd.download([u'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, u'544a9468546059d4e80d76265b0443b8') - - @_skip_unless(youtube_dl.InfoExtractors.XNXXIE._WORKING, "IE marked as not _WORKING") - def test_XNXX(self): - filename = u'1135332.flv' - params = self.parameters - fd = FileDownloader(params) - fd.add_info_extractor(youtube_dl.InfoExtractors.XNXXIE()) - fd.download([u'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, u'0831677e2b4761795f68d417e0b7b445') - - @_skip_unless(youtube_dl.InfoExtractors.YoukuIE._WORKING, "IE marked as not _WORKING") - def test_Youku(self): - filename = u'XNDgyMDQ2NTQw_part00.flv' - params = self.parameters - params["test"] = False - fd = FileDownloader(params) - fd.add_info_extractor(youtube_dl.InfoExtractors.YoukuIE()) - fd.download([u'http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html']) - self.assertTrue(os.path.exists(filename)) - md5_for_file = _file_md5(filename) - self.assertEqual(md5_for_file, u'ffe3f2e435663dc2d1eea34faeff5b5b') - - - def tearDown(self): - if os.path.exists(u'BaW_jenozKc.mp4'): - os.remove(u'BaW_jenozKc.mp4') - if os.path.exists(u'x33vw9.mp4'): - os.remove(u'x33vw9.mp4') - if os.path.exists(u'_aUehQsCQtM.flv'): - os.remove(u'_aUehQsCQtM.flv') - if os.path.exists(u'5779306.m4v'): - os.remove(u'5779306.m4v') - if os.path.exists(u'939581.flv'): - os.remove(u'939581.flv') - if os.path.exists(u'14160053.mp4'): - os.remove(u'14160053.mp4') - if os.path.exists(u'62986583.mp3'): - os.remove(u'62986583.mp3') - if os.path.exists(u'PracticalUnix_intro-environment.mp4'): - os.remove(u'PracticalUnix_intro-environment.mp4') - if os.path.exists(u'1135332.flv'): - os.remove(u'1135332.flv') - if os.path.exists(u'XNDgyMDQ2NTQw_part00.flv'): - os.remove(u'XNDgyMDQ2NTQw_part00.flv') +from youtube_dl.FileDownloader import FileDownloader +#import all the info extractor +import youtube_dl + +DEF_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'tests.json') +PARAM_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'parameters.json' +) + + +class TestDownload(unittest.TestCase): + pass + + +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() + + +def generator(name, url, md5, file, ie_param, optional_ie): + def test_template(self): + fd = FileDownloader(ie_param) + fd.add_info_extractor(getattr(youtube_dl, name + "IE")()) + fd.download([url]) + self.assertTrue(os.path.exists(file)) + self.assertEqual(md5_for_file(file), md5) + return test_template + #only python 2.7 + +def clean_generator(files): + def clean_template(self): + for file_name in files: + if os.path.exists(file_name): + os.remove(file_name) + return clean_template + +with open(DEF_FILE, "r") as f: + with open(PARAM_FILE) as fp: + p = json.load(fp) + test_param = json.load(f) + files = set() + for test_case in test_param: + if test_case.get("broken", False): + continue + try: + files.add(test_case["file"]) + test_method = generator(test_case['name'], test_case['url'], test_case['md5'], test_case['file'], p, test_case.get('add_ie', [])) + test_method.__name__ = "test_{0}".format(test_case["name"]) + setattr(TestDownload, test_method.__name__, test_method) + del test_method + except KeyError as e: + sys.stderr.write("Issue with the parameters of test {0}.\n".format(test_case.get("name", "unknown test"))) + #clean the files + ff = clean_generator(files) + ff.__name__ = "tearDown" + setattr(TestDownload, ff.__name__, ff) + del ff if __name__ == '__main__': diff --git a/test/tests.json b/test/tests.json index 34992a321..40bb0d4f2 100644 --- a/test/tests.json +++ b/test/tests.json @@ -12,7 +12,7 @@ }, { "name": "Metacafe", - "addIEs": ["Youtube"], + "add_ie": ["Youtube"], "url": "http://www.metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/", "file": "_aUehQsCQtM.flv" }, @@ -57,6 +57,6 @@ "url": "http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html", "file": "XNDgyMDQ2NTQw_part00.flv", "md5": "ffe3f2e435663dc2d1eea34faeff5b5b", - "params": { "test": false } + "broken": true } ] -- cgit v1.2.3 From fd5ff02042909120bb5eecc3f884ad809dbe25e3 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Wed, 12 Dec 2012 14:15:21 +0100 Subject: streamlined and simplified dynamic tests generation; readded a couple of test features --- test/test_download.py | 126 ++++++++++++++++++++++++++------------------- test/test_youtube_lists.py | 2 +- test/tests.json | 2 +- 3 files changed, 76 insertions(+), 54 deletions(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index be15fb5ab..bce0e4fcd 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -1,72 +1,94 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python + import hashlib +import io import os import json import unittest import sys +import socket + +# Allow direct execution +sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dl.FileDownloader import FileDownloader -#import all the info extractor -import youtube_dl +import youtube_dl.FileDownloader +import youtube_dl.InfoExtractors +from youtube_dl.utils import * DEF_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'tests.json') -PARAM_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'parameters.json' -) +PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json") + +# General configuration (from __init__, not very elegant...) +jar = compat_cookiejar.CookieJar() +cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar) +proxy_handler = compat_urllib_request.ProxyHandler() +opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler()) +compat_urllib_request.install_opener(opener) +socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words) + +class FileDownloader(youtube_dl.FileDownloader): + def __init__(self, *args, **kwargs): + youtube_dl.FileDownloader.__init__(self, *args, **kwargs) + self.to_stderr = self.to_screen +def _file_md5(fn): + with open(fn, 'rb') as f: + return hashlib.md5(f.read()).hexdigest() + +with io.open(DEF_FILE, encoding='utf-8') as deff: + defs = json.load(deff) +with io.open(PARAMETERS_FILE, encoding='utf-8') as pf: + parameters = json.load(pf) class TestDownload(unittest.TestCase): - pass + def setUp(self): + self.parameters = parameters + self.defs = defs + + # Clear old files + self.tearDown() + def tearDown(self): + for fn in [ test.get('file', False) for test in self.defs ]: + if fn and os.path.exists(fn): + os.remove(fn) -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() +### Dinamically generate tests +def generator(test_case): -def generator(name, url, md5, file, ie_param, optional_ie): def test_template(self): - fd = FileDownloader(ie_param) - fd.add_info_extractor(getattr(youtube_dl, name + "IE")()) - fd.download([url]) - self.assertTrue(os.path.exists(file)) - self.assertEqual(md5_for_file(file), md5) + ie = getattr(youtube_dl.InfoExtractors, test_case['name'] + 'IE') + if not ie._WORKING: + print('Skipping: IE marked as not _WORKING') + return + if not test_case['file']: + print('Skipping: No output file specified') + return + if 'skip' in test_case: + print('Skipping: {0}'.format(test_case['skip'])) + return + params = dict(self.parameters) # Duplicate it locally + for p in test_case.get('params', {}): + params[p] = test_case['params'][p] + fd = FileDownloader(params) + fd.add_info_extractor(ie()) + for ien in test_case.get('add_ie', []): + fd.add_info_extractor(getattr(youtube_dl.InfoExtractors, ien + 'IE')()) + fd.download([test_case['url']]) + self.assertTrue(os.path.exists(test_case['file'])) + if 'md5' in test_case: + md5_for_file = _file_md5(test_case['file']) + self.assertEqual(md5_for_file, test_case['md5']) + return test_template - #only python 2.7 - -def clean_generator(files): - def clean_template(self): - for file_name in files: - if os.path.exists(file_name): - os.remove(file_name) - return clean_template - -with open(DEF_FILE, "r") as f: - with open(PARAM_FILE) as fp: - p = json.load(fp) - test_param = json.load(f) - files = set() - for test_case in test_param: - if test_case.get("broken", False): - continue - try: - files.add(test_case["file"]) - test_method = generator(test_case['name'], test_case['url'], test_case['md5'], test_case['file'], p, test_case.get('add_ie', [])) - test_method.__name__ = "test_{0}".format(test_case["name"]) - setattr(TestDownload, test_method.__name__, test_method) - del test_method - except KeyError as e: - sys.stderr.write("Issue with the parameters of test {0}.\n".format(test_case.get("name", "unknown test"))) - #clean the files - ff = clean_generator(files) - ff.__name__ = "tearDown" - setattr(TestDownload, ff.__name__, ff) - del ff + +### And add them to TestDownload +for test_case in defs: + test_method = generator(test_case) + test_method.__name__ = "test_{0}".format(test_case["name"]) + setattr(TestDownload, test_method.__name__, test_method) + del test_method if __name__ == '__main__': diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py index 8939a5259..f9c344da1 100644 --- a/test/test_youtube_lists.py +++ b/test/test_youtube_lists.py @@ -57,7 +57,7 @@ class TestYoutubeLists(unittest.TestCase): self.assertEqual(DL.result[-1], ['http://www.youtube.com/watch?v=rYefUsYuEp0']) def test_youtube_channel(self): - """I give up, please find a channel that does paginate and test this like test_youtube_playlist_long""" + # I give up, please find a channel that does paginate and test this like test_youtube_playlist_long pass # TODO def test_youtube_user(self): diff --git a/test/tests.json b/test/tests.json index 40bb0d4f2..706149bf8 100644 --- a/test/tests.json +++ b/test/tests.json @@ -57,6 +57,6 @@ "url": "http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html", "file": "XNDgyMDQ2NTQw_part00.flv", "md5": "ffe3f2e435663dc2d1eea34faeff5b5b", - "broken": true + "params": { "test": false } } ] -- cgit v1.2.3 From a276e060806c6cabc76b9df964db67939b643e43 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Wed, 12 Dec 2012 15:00:03 +0100 Subject: Don't be too clever --- test/test_download.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index bce0e4fcd..114ff1783 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -49,14 +49,13 @@ class TestDownload(unittest.TestCase): self.tearDown() def tearDown(self): - for fn in [ test.get('file', False) for test in self.defs ]: + for test in self.defs: + fn = test['file'] if fn and os.path.exists(fn): os.remove(fn) -### Dinamically generate tests -def generator(test_case): - +def make_test_method(test_case): def test_template(self): ie = getattr(youtube_dl.InfoExtractors, test_case['name'] + 'IE') if not ie._WORKING: @@ -81,14 +80,13 @@ def generator(test_case): md5_for_file = _file_md5(test_case['file']) self.assertEqual(md5_for_file, test_case['md5']) + # TODO proper skipping annotations return test_template -### And add them to TestDownload for test_case in defs: - test_method = generator(test_case) + test_method = make_test_method(test_case) test_method.__name__ = "test_{0}".format(test_case["name"]) setattr(TestDownload, test_method.__name__, test_method) - del test_method if __name__ == '__main__': -- cgit v1.2.3 From 5d01a64719607e4ade7e0dc069efea9888ed2e5d Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Wed, 12 Dec 2012 15:14:58 +0100 Subject: Revert "Don't be too clever" This reverts commit a276e060806c6cabc76b9df964db67939b643e43. --- test/test_download.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index 114ff1783..bce0e4fcd 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -49,13 +49,14 @@ class TestDownload(unittest.TestCase): self.tearDown() def tearDown(self): - for test in self.defs: - fn = test['file'] + for fn in [ test.get('file', False) for test in self.defs ]: if fn and os.path.exists(fn): os.remove(fn) -def make_test_method(test_case): +### Dinamically generate tests +def generator(test_case): + def test_template(self): ie = getattr(youtube_dl.InfoExtractors, test_case['name'] + 'IE') if not ie._WORKING: @@ -80,13 +81,14 @@ def make_test_method(test_case): md5_for_file = _file_md5(test_case['file']) self.assertEqual(md5_for_file, test_case['md5']) - # TODO proper skipping annotations return test_template +### And add them to TestDownload for test_case in defs: - test_method = make_test_method(test_case) + test_method = generator(test_case) test_method.__name__ = "test_{0}".format(test_case["name"]) setattr(TestDownload, test_method.__name__, test_method) + del test_method if __name__ == '__main__': -- cgit v1.2.3 From 4cc3d0742663c92ef5cf89927edee4300666ea69 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 13 Dec 2012 21:27:57 +0100 Subject: NBA IE (Closes #590) --- test/tests.json | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'test') diff --git a/test/tests.json b/test/tests.json index 706149bf8..58e73e7e1 100644 --- a/test/tests.json +++ b/test/tests.json @@ -58,5 +58,11 @@ "file": "XNDgyMDQ2NTQw_part00.flv", "md5": "ffe3f2e435663dc2d1eea34faeff5b5b", "params": { "test": false } + }, + { + "name": "NBA", + "url": "http://www.nba.com/video/games/nets/2012/12/04/0021200253-okc-bkn-recap.nba/index.html", + "file": "0021200253-okc-bkn-recap.nba.mp4", + "md5": "c0edcfc37607344e2ff8f13c378c88a4" } ] -- cgit v1.2.3 From b375c8b9469a94a4c8f0c8acc1558d2d6005f01b Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Sun, 16 Dec 2012 11:17:10 +0100 Subject: Tests for justin.tv --- test/tests.json | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'test') diff --git a/test/tests.json b/test/tests.json index 58e73e7e1..cdf360044 100644 --- a/test/tests.json +++ b/test/tests.json @@ -64,5 +64,11 @@ "url": "http://www.nba.com/video/games/nets/2012/12/04/0021200253-okc-bkn-recap.nba/index.html", "file": "0021200253-okc-bkn-recap.nba.mp4", "md5": "c0edcfc37607344e2ff8f13c378c88a4" + }, + { + "name": "JustinTV", + "url": "http://www.twitch.tv/thegamedevhub/b/296128360", + "file": "296128360.flv", + "md5": "ecaa8a790c22a40770901460af191c9a" } ] -- cgit v1.2.3 From 5e5ddcfbcf62d975e46ffaa0aaee8744f70913e1 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Mon, 17 Dec 2012 16:23:55 +0100 Subject: test subtitles --- test/test_youtube_lists.py | 7 ++++- test/test_youtube_subtitles.py | 59 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 test/test_youtube_subtitles.py (limited to 'test') diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py index f9c344da1..e352e5ab9 100644 --- a/test/test_youtube_lists.py +++ b/test/test_youtube_lists.py @@ -3,6 +3,7 @@ import sys import unittest import socket +import json # Allow direct execution import os @@ -11,6 +12,10 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from youtube_dl.InfoExtractors import YoutubeUserIE,YoutubePlaylistIE from youtube_dl.utils import * +PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json") +with io.open(PARAMETERS_FILE, encoding='utf-8') as pf: + parameters = json.load(pf) + # General configuration (from __init__, not very elegant...) jar = compat_cookiejar.CookieJar() cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar) @@ -22,7 +27,7 @@ socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words) class FakeDownloader(object): def __init__(self): self.result = [] - self.params = {} + self.params = parameters def to_screen(self, s): print(s) def trouble(self, s): diff --git a/test/test_youtube_subtitles.py b/test/test_youtube_subtitles.py new file mode 100644 index 000000000..64a391d14 --- /dev/null +++ b/test/test_youtube_subtitles.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python + +import sys +import unittest +import socket +import json +import io +import hashlib + +# Allow direct execution +import os +sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +from youtube_dl.InfoExtractors import YoutubeIE +from youtube_dl.utils import * + +PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json") +with io.open(PARAMETERS_FILE, encoding='utf-8') as pf: + parameters = json.load(pf) + +# General configuration (from __init__, not very elegant...) +jar = compat_cookiejar.CookieJar() +cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar) +proxy_handler = compat_urllib_request.ProxyHandler() +opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler()) +compat_urllib_request.install_opener(opener) +socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words) + +class FakeDownloader(object): + def __init__(self): + self.result = [] + self.params = parameters + def to_screen(self, s): + print(s) + def trouble(self, s): + raise Exception(s) + def download(self, x): + self.result.append(x) + +md5 = lambda s: hashlib.md5(s.encode('utf-8')).hexdigest() + +class TestYoutubeSubtitles(unittest.TestCase): + def test_youtube_subtitles(self): + DL = FakeDownloader() + DL.params['writesubtitles'] = True + IE = YoutubeIE(DL) + info_dict = IE.extract('QRS8MkLhQmM') + self.assertEqual(md5(info_dict[0]['subtitles']), 'c3228550d59116f3c29fba370b55d033') + + def test_youtube_subtitles_it(self): + DL = FakeDownloader() + DL.params['writesubtitles'] = True + DL.params['subtitleslang'] = 'it' + IE = YoutubeIE(DL) + info_dict = IE.extract('QRS8MkLhQmM') + self.assertEqual(md5(info_dict[0]['subtitles']), '132a88a0daf8e1520f393eb58f1f646a') + +if __name__ == '__main__': + unittest.main() -- cgit v1.2.3 From 937021133fccff967e3a16cccde5e93fc4233d6f Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Mon, 17 Dec 2012 18:33:11 +0100 Subject: a number of new tests and fixes; all tests green on 3.3 --- test/tests.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'test') diff --git a/test/tests.json b/test/tests.json index cdf360044..97654edd9 100644 --- a/test/tests.json +++ b/test/tests.json @@ -70,5 +70,22 @@ "url": "http://www.twitch.tv/thegamedevhub/b/296128360", "file": "296128360.flv", "md5": "ecaa8a790c22a40770901460af191c9a" + }, + { + "name": "MyVideo", + "url": "http://www.myvideo.de/watch/8229274/bowling_fail_or_win", + "file": "8229274.flv", + "md5": "2d2753e8130479ba2cb7e0a37002053e" + }, + { + "name": "Escapist", + "url": "http://www.escapistmagazine.com/videos/view/the-escapist-presents/6618-Breaking-Down-Baldurs-Gate", + "file": "6618-Breaking-Down-Baldurs-Gate.flv", + "md5": "c6793dbda81388f4264c1ba18684a74d" + }, + { + "name": "GooglePlus", + "url": "https://plus.google.com/u/0/108897254135232129896/posts/ZButuJc6CtH", + "file": "ZButuJc6CtH.flv" } ] -- cgit v1.2.3 From 77bd7968eaa7a439c03e22f75b094923100c3cf1 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Mon, 17 Dec 2012 20:32:05 +0100 Subject: Switch test to metacafe.com, whose DNS seems to be fine atm --- test/tests.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/tests.json b/test/tests.json index 97654edd9..5c4cf51bf 100644 --- a/test/tests.json +++ b/test/tests.json @@ -13,7 +13,7 @@ { "name": "Metacafe", "add_ie": ["Youtube"], - "url": "http://www.metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/", + "url": "http://metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/", "file": "_aUehQsCQtM.flv" }, { -- cgit v1.2.3 From 3cc687d486c5fc4710b6fdec4340b7635cec91c9 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 20 Dec 2012 13:11:52 +0100 Subject: test write_info_json --- test/test_write_info_json.py | 55 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 test/test_write_info_json.py (limited to 'test') diff --git a/test/test_write_info_json.py b/test/test_write_info_json.py new file mode 100644 index 000000000..e59fee91c --- /dev/null +++ b/test/test_write_info_json.py @@ -0,0 +1,55 @@ +#!/usr/bin/env python + +import os +import socket +import sys +import unittest + +# Allow direct execution +sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +import youtube_dl.FileDownloader +import youtube_dl.InfoExtractors +from youtube_dl.utils import * + +PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json") + +# General configuration (from __init__, not very elegant...) +jar = compat_cookiejar.CookieJar() +cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar) +proxy_handler = compat_urllib_request.ProxyHandler() +opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler()) +compat_urllib_request.install_opener(opener) +socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words) + +class FileDownloader(youtube_dl.FileDownloader): + def __init__(self, *args, **kwargs): + youtube_dl.FileDownloader.__init__(self, *args, **kwargs) + self.to_stderr = self.to_screen + +with io.open(PARAMETERS_FILE, encoding='utf-8') as pf: + params = json.load(pf) +params['writeinfojson'] = True +params['skip_download'] = True + +TEST_ID = 'BaW_jenozKc' +INFO_JSON_FILE = TEST_ID + '.mp4.info.json' + +class TestInfoJSON(unittest.TestCase): + def setUp(self): + # Clear old files + self.tearDown() + + def test_info_json(self): + ie = youtube_dl.InfoExtractors.YoutubeIE() + fd = FileDownloader(params) + fd.add_info_extractor(ie) + fd.download([TEST_ID]) + self.assertTrue(os.path.exists(INFO_JSON_FILE)) + + def tearDown(self): + if os.path.exists(INFO_JSON_FILE): + os.remove(INFO_JSON_FILE) + +if __name__ == '__main__': + unittest.main() -- cgit v1.2.3 From af42895612d0958f5c20499c5adafb25270fdb8d Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 20 Dec 2012 13:26:21 +0100 Subject: Extend json info data / description file test --- test/test_write_info_json.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'test') diff --git a/test/test_write_info_json.py b/test/test_write_info_json.py index e59fee91c..ebf543980 100644 --- a/test/test_write_info_json.py +++ b/test/test_write_info_json.py @@ -1,5 +1,7 @@ #!/usr/bin/env python +# coding: utf-8 +import json import os import socket import sys @@ -31,9 +33,16 @@ with io.open(PARAMETERS_FILE, encoding='utf-8') as pf: params = json.load(pf) params['writeinfojson'] = True params['skip_download'] = True +params['writedescription'] = True TEST_ID = 'BaW_jenozKc' INFO_JSON_FILE = TEST_ID + '.mp4.info.json' +DESCRIPTION_FILE = TEST_ID + '.mp4.description' +EXPECTED_DESCRIPTION = u'''test chars: "'/\ä↭𝕐 + +This is a test video for youtube-dl. + +For more information, contact phihag@phihag.de .''' class TestInfoJSON(unittest.TestCase): def setUp(self): @@ -46,10 +55,25 @@ class TestInfoJSON(unittest.TestCase): fd.add_info_extractor(ie) fd.download([TEST_ID]) self.assertTrue(os.path.exists(INFO_JSON_FILE)) + with io.open(INFO_JSON_FILE, 'r', encoding='utf-8') as jsonf: + jd = json.load(jsonf) + self.assertEqual(jd['upload_date'], u'20121002') + self.assertEqual(jd['description'], EXPECTED_DESCRIPTION) + self.assertEqual(jd['id'], TEST_ID) + self.assertEqual(jd['extractor'], 'youtube') + self.assertEqual(jd['title'], u'''youtube-dl test video "'/\ä↭𝕐''') + self.assertEqual(jd['uploader'], 'Philipp Hagemeister') + + self.assertTrue(os.path.exists(DESCRIPTION_FILE)) + with io.open(DESCRIPTION_FILE, 'r', encoding='utf-8') as descf: + descr = descf.read() + self.assertEqual(descr, EXPECTED_DESCRIPTION) def tearDown(self): if os.path.exists(INFO_JSON_FILE): os.remove(INFO_JSON_FILE) + if os.path.exists(DESCRIPTION_FILE): + os.remove(DESCRIPTION_FILE) if __name__ == '__main__': unittest.main() -- cgit v1.2.3 From 314d506b96d87a212e7e57eaa4d86514579c1c12 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 20 Dec 2012 13:26:37 +0100 Subject: Do not use deprecated method --- test/test_utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/test_utils.py b/test/test_utils.py index 796ed4ab2..eeaaa7fad 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -82,9 +82,9 @@ class TestUtil(unittest.TestCase): self.assertTrue(sanitize_filename(':', restricted=True) != '') def test_sanitize_ids(self): - self.assertEquals(sanitize_filename('_n_cd26wFpw', is_id=True), '_n_cd26wFpw') - self.assertEquals(sanitize_filename('_BD_eEpuzXw', is_id=True), '_BD_eEpuzXw') - self.assertEquals(sanitize_filename('N0Y__7-UOdI', is_id=True), 'N0Y__7-UOdI') + self.assertEqual(sanitize_filename('_n_cd26wFpw', is_id=True), '_n_cd26wFpw') + self.assertEqual(sanitize_filename('_BD_eEpuzXw', is_id=True), '_BD_eEpuzXw') + self.assertEqual(sanitize_filename('N0Y__7-UOdI', is_id=True), 'N0Y__7-UOdI') def test_ordered_set(self): self.assertEqual(orderedSet([1, 1, 2, 3, 4, 4, 5, 6, 7, 3, 5]), [1, 2, 3, 4, 5, 6, 7]) -- cgit v1.2.3 From 0eaf520d7758d57c61afe1832c1db9a4fb2ccc88 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Thu, 20 Dec 2012 14:14:43 +0100 Subject: add info_dict testing to test_download --- test/test_download.py | 18 +++++++++++++++++- test/tests.json | 8 +++++++- 2 files changed, 24 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index bce0e4fcd..9a6d4d604 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -7,6 +7,7 @@ import json import unittest import sys import socket +import hashlib # Allow direct execution sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) @@ -28,8 +29,12 @@ socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words) class FileDownloader(youtube_dl.FileDownloader): def __init__(self, *args, **kwargs): - youtube_dl.FileDownloader.__init__(self, *args, **kwargs) self.to_stderr = self.to_screen + self.processed_info_dicts = [] + return youtube_dl.FileDownloader.__init__(self, *args, **kwargs) + def process_info(self, info_dict): + self.processed_info_dicts.append(info_dict) + return youtube_dl.FileDownloader.process_info(self, info_dict) def _file_md5(fn): with open(fn, 'rb') as f: @@ -40,6 +45,7 @@ with io.open(DEF_FILE, encoding='utf-8') as deff: with io.open(PARAMETERS_FILE, encoding='utf-8') as pf: parameters = json.load(pf) + class TestDownload(unittest.TestCase): def setUp(self): self.parameters = parameters @@ -68,18 +74,28 @@ def generator(test_case): if 'skip' in test_case: print('Skipping: {0}'.format(test_case['skip'])) return + params = dict(self.parameters) # Duplicate it locally for p in test_case.get('params', {}): params[p] = test_case['params'][p] + fd = FileDownloader(params) fd.add_info_extractor(ie()) for ien in test_case.get('add_ie', []): fd.add_info_extractor(getattr(youtube_dl.InfoExtractors, ien + 'IE')()) fd.download([test_case['url']]) + self.assertTrue(os.path.exists(test_case['file'])) if 'md5' in test_case: md5_for_file = _file_md5(test_case['file']) self.assertEqual(md5_for_file, test_case['md5']) + info_dict = fd.processed_info_dicts[0] + for (info_element, value) in test_case.get('info_dict', {}).items(): + if value.startswith('md5:'): + md5_info_value = hashlib.md5(info_dict[info_element]).hexdigest() + self.assertEqual(value[3:], md5_info_value) + else: + self.assertEqual(value, info_dict[info_element]) return test_template diff --git a/test/tests.json b/test/tests.json index 5c4cf51bf..4f8f68f38 100644 --- a/test/tests.json +++ b/test/tests.json @@ -2,7 +2,13 @@ { "name": "Youtube", "url": "http://www.youtube.com/watch?v=BaW_jenozKc", - "file": "BaW_jenozKc.mp4" + "file": "BaW_jenozKc.mp4", + "info_dict": { + "title": "youtube-dl test video \"'/\\ä↭𝕐", + "uploader": "Philipp Hagemeister", + "upload_date": "20121002", + "description": "test chars: \"'/\\ä↭𝕐\n\nThis is a test video for youtube-dl.\n\nFor more information, contact phihag@phihag.de ." + } }, { "name": "Dailymotion", -- cgit v1.2.3 From 77c4beab8a0c13e158bad8af4e014d57766f1940 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Thu, 20 Dec 2012 16:28:16 +0100 Subject: new info_dict field: uploader_id --- test/tests.json | 1 + 1 file changed, 1 insertion(+) (limited to 'test') diff --git a/test/tests.json b/test/tests.json index 4f8f68f38..83afda985 100644 --- a/test/tests.json +++ b/test/tests.json @@ -6,6 +6,7 @@ "info_dict": { "title": "youtube-dl test video \"'/\\ä↭𝕐", "uploader": "Philipp Hagemeister", + "uploader_id": "phihag", "upload_date": "20121002", "description": "test chars: \"'/\\ä↭𝕐\n\nThis is a test video for youtube-dl.\n\nFor more information, contact phihag@phihag.de ." } -- cgit v1.2.3 From 6b3aef80ceba9b4715065be924dcb1f83ec36655 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Thu, 20 Dec 2012 16:30:55 +0100 Subject: better Vimeo tests; fixed a couple of VimeoIE fields --- test/test_download.py | 9 ++++----- test/test_write_info_json.py | 2 -- test/test_youtube_lists.py | 2 -- test/test_youtube_subtitles.py | 2 -- test/tests.json | 13 ++++++++++--- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index 9a6d4d604..1ee1b334d 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -6,8 +6,8 @@ import os import json import unittest import sys -import socket import hashlib +import socket # Allow direct execution sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) @@ -25,7 +25,6 @@ cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar) proxy_handler = compat_urllib_request.ProxyHandler() opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler()) compat_urllib_request.install_opener(opener) -socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words) class FileDownloader(youtube_dl.FileDownloader): def __init__(self, *args, **kwargs): @@ -90,12 +89,12 @@ def generator(test_case): md5_for_file = _file_md5(test_case['file']) self.assertEqual(md5_for_file, test_case['md5']) info_dict = fd.processed_info_dicts[0] - for (info_element, value) in test_case.get('info_dict', {}).items(): + for (info_field, value) in test_case.get('info_dict', {}).items(): if value.startswith('md5:'): - md5_info_value = hashlib.md5(info_dict[info_element]).hexdigest() + md5_info_value = hashlib.md5(info_dict.get(info_field, '')).hexdigest() self.assertEqual(value[3:], md5_info_value) else: - self.assertEqual(value, info_dict[info_element]) + self.assertEqual(value, info_dict.get(info_field)) return test_template diff --git a/test/test_write_info_json.py b/test/test_write_info_json.py index ebf543980..8134dda37 100644 --- a/test/test_write_info_json.py +++ b/test/test_write_info_json.py @@ -3,7 +3,6 @@ import json import os -import socket import sys import unittest @@ -22,7 +21,6 @@ cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar) proxy_handler = compat_urllib_request.ProxyHandler() opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler()) compat_urllib_request.install_opener(opener) -socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words) class FileDownloader(youtube_dl.FileDownloader): def __init__(self, *args, **kwargs): diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py index e352e5ab9..3044e0852 100644 --- a/test/test_youtube_lists.py +++ b/test/test_youtube_lists.py @@ -2,7 +2,6 @@ import sys import unittest -import socket import json # Allow direct execution @@ -22,7 +21,6 @@ cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar) proxy_handler = compat_urllib_request.ProxyHandler() opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler()) compat_urllib_request.install_opener(opener) -socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words) class FakeDownloader(object): def __init__(self): diff --git a/test/test_youtube_subtitles.py b/test/test_youtube_subtitles.py index 64a391d14..5d3566a35 100644 --- a/test/test_youtube_subtitles.py +++ b/test/test_youtube_subtitles.py @@ -2,7 +2,6 @@ import sys import unittest -import socket import json import io import hashlib @@ -24,7 +23,6 @@ cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar) proxy_handler = compat_urllib_request.ProxyHandler() opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler()) compat_urllib_request.install_opener(opener) -socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words) class FakeDownloader(object): def __init__(self): diff --git a/test/tests.json b/test/tests.json index 83afda985..d24bdf6fc 100644 --- a/test/tests.json +++ b/test/tests.json @@ -37,9 +37,16 @@ }, { "name": "Vimeo", - "md5": "60540a4ec7cc378ec84b919c0aed5023", - "url": "http://vimeo.com/14160053", - "file": "14160053.mp4" + "md5": "8879b6cc097e987f02484baf890129e5", + "url": "http://vimeo.com/56015672", + "file": "56015672.mp4", + "info_dict": { + "title": "youtube-dl test video - ★ \" ' 幸 / \\ ä ↭ 𝕐", + "uploader": "Filippo Valsorda", + "uploader_id": "user7108434", + "upload_date": "20121220", + "description": "This is a test case for youtube-dl.\nFor more information, see github.com/rg3/youtube-dl\nTest chars: ★ \" ' 幸 / \\ ä ↭ 𝕐" + } }, { "name": "Soundcloud", -- cgit v1.2.3 From 162e3c52616a72f4ddc11b0e5de0f2425e512896 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Thu, 20 Dec 2012 17:21:46 +0100 Subject: Temporary skip Escapist test as it fails only on Travis; we'll make a more specific workaround later if we can't fix it --- test/tests.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/tests.json b/test/tests.json index d24bdf6fc..b573affc5 100644 --- a/test/tests.json +++ b/test/tests.json @@ -95,7 +95,8 @@ "name": "Escapist", "url": "http://www.escapistmagazine.com/videos/view/the-escapist-presents/6618-Breaking-Down-Baldurs-Gate", "file": "6618-Breaking-Down-Baldurs-Gate.flv", - "md5": "c6793dbda81388f4264c1ba18684a74d" + "md5": "c6793dbda81388f4264c1ba18684a74d", + "skip": "Fails with timeout on Travis" }, { "name": "GooglePlus", -- cgit v1.2.3 From 21a9c6aaac074b3ad85adc55818573e7971f8043 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 20 Dec 2012 21:28:27 +0100 Subject: FunnyOrDie IE (Fixes #599) --- test/tests.json | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'test') diff --git a/test/tests.json b/test/tests.json index 5c4cf51bf..9bf56082e 100644 --- a/test/tests.json +++ b/test/tests.json @@ -87,5 +87,11 @@ "name": "GooglePlus", "url": "https://plus.google.com/u/0/108897254135232129896/posts/ZButuJc6CtH", "file": "ZButuJc6CtH.flv" + }, + { + "name": "FunnyOrDie", + "url": "http://www.funnyordie.com/videos/0732f586d7/heart-shaped-box-literal-video-version", + "file": "0732f586d7.mp4", + "md5": "f647e9e90064b53b6e046e75d0241fbd" } ] -- cgit v1.2.3 From d0d4f277da6f1f74e5adcf532b17d01d52943ba8 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 27 Dec 2012 01:38:41 +0100 Subject: TweetReel IE --- test/tests.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'test') diff --git a/test/tests.json b/test/tests.json index dbff62676..c2de6099d 100644 --- a/test/tests.json +++ b/test/tests.json @@ -108,5 +108,17 @@ "url": "http://www.funnyordie.com/videos/0732f586d7/heart-shaped-box-literal-video-version", "file": "0732f586d7.mp4", "md5": "f647e9e90064b53b6e046e75d0241fbd" + }, + { + "name": "TweetReel", + "url": "http://tweetreel.com/?77smq", + "file": "77smq.mov", + "md5": "56b4d9ca9de467920f3f99a6d91255d6", + "info_dict": { + "uploader": "itszero", + "uploader_id": "itszero", + "upload_date": "20091225", + "description": "Installing Gentoo Linux on Powerbook G4, it turns out the sleep indicator becomes HDD activity indicator :D" + } } ] -- cgit v1.2.3 From 3bb6165927c277c3af73d5ef1ffb6ce9ea663d10 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 27 Dec 2012 05:31:36 +0100 Subject: Allow ampersand right after ? in youtube URLs (Closes #602) --- test/test_all_urls.py | 27 +++++++++++++++++++++++++++ test/test_youtube_playlist_ids.py | 22 ---------------------- 2 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 test/test_all_urls.py delete mode 100644 test/test_youtube_playlist_ids.py (limited to 'test') diff --git a/test/test_all_urls.py b/test/test_all_urls.py new file mode 100644 index 000000000..06de8e7b8 --- /dev/null +++ b/test/test_all_urls.py @@ -0,0 +1,27 @@ +#!/usr/bin/env python + +import sys +import unittest + +# Allow direct execution +import os +sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +from youtube_dl.InfoExtractors import YoutubeIE, YoutubePlaylistIE + +class TestAllURLsMatching(unittest.TestCase): + def test_youtube_playlist_matching(self): + self.assertTrue(YoutubePlaylistIE().suitable(u'ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')) + self.assertTrue(YoutubePlaylistIE().suitable(u'PL63F0C78739B09958')) + self.assertFalse(YoutubePlaylistIE().suitable(u'PLtS2H6bU1M')) + + def test_youtube_matching(self): + self.assertTrue(YoutubeIE().suitable(u'PLtS2H6bU1M')) + + def test_youtube_extract(self): + self.assertEqual(YoutubeIE()._extract_id('http://www.youtube.com/watch?&v=BaW_jenozKc'), 'BaW_jenozKc') + self.assertEqual(YoutubeIE()._extract_id('https://www.youtube.com/watch?&v=BaW_jenozKc'), 'BaW_jenozKc') + self.assertEqual(YoutubeIE()._extract_id('https://www.youtube.com/watch?feature=player_embedded&v=BaW_jenozKc'), 'BaW_jenozKc') + +if __name__ == '__main__': + unittest.main() diff --git a/test/test_youtube_playlist_ids.py b/test/test_youtube_playlist_ids.py deleted file mode 100644 index 2eeb3216c..000000000 --- a/test/test_youtube_playlist_ids.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python - -import sys -import unittest - -# Allow direct execution -import os -sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) - -from youtube_dl.InfoExtractors import YoutubeIE, YoutubePlaylistIE - -class TestYoutubePlaylistMatching(unittest.TestCase): - def test_playlist_matching(self): - self.assertTrue(YoutubePlaylistIE().suitable(u'ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')) - self.assertTrue(YoutubePlaylistIE().suitable(u'PL63F0C78739B09958')) - self.assertFalse(YoutubePlaylistIE().suitable(u'PLtS2H6bU1M')) - - def test_youtube_matching(self): - self.assertTrue(YoutubeIE().suitable(u'PLtS2H6bU1M')) - -if __name__ == '__main__': - unittest.main() -- cgit v1.2.3 From 95fedbf86bd6c8820b01768db53355fe488dff5e Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Mon, 31 Dec 2012 19:09:37 +0100 Subject: three small edits * ask for a --verbose log when reporting bugs in README.md * re-enable Escapist test, seems stable now * check that we are not downloading multiple videos when the template is fixed (NOT a complete fix: not detecting playlists) --- test/tests.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'test') diff --git a/test/tests.json b/test/tests.json index c2de6099d..982e0ad3b 100644 --- a/test/tests.json +++ b/test/tests.json @@ -95,8 +95,7 @@ "name": "Escapist", "url": "http://www.escapistmagazine.com/videos/view/the-escapist-presents/6618-Breaking-Down-Baldurs-Gate", "file": "6618-Breaking-Down-Baldurs-Gate.flv", - "md5": "c6793dbda81388f4264c1ba18684a74d", - "skip": "Fails with timeout on Travis" + "md5": "c6793dbda81388f4264c1ba18684a74d" }, { "name": "GooglePlus", -- cgit v1.2.3 From 0214ce7c7584bd27c6e175065e3991d97af05855 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Mon, 31 Dec 2012 19:21:28 +0100 Subject: Ok, the Escapist test was passing only in my Travis repo, do not ask me why; also, a small bugfix to the latest commit --- test/tests.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/tests.json b/test/tests.json index 982e0ad3b..c2de6099d 100644 --- a/test/tests.json +++ b/test/tests.json @@ -95,7 +95,8 @@ "name": "Escapist", "url": "http://www.escapistmagazine.com/videos/view/the-escapist-presents/6618-Breaking-Down-Baldurs-Gate", "file": "6618-Breaking-Down-Baldurs-Gate.flv", - "md5": "c6793dbda81388f4264c1ba18684a74d" + "md5": "c6793dbda81388f4264c1ba18684a74d", + "skip": "Fails with timeout on Travis" }, { "name": "GooglePlus", -- cgit v1.2.3 From deb594a9a04236a9e034bac16f625df3fed2b352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Tue, 1 Jan 2013 14:39:45 +0100 Subject: Test for steam --- test/tests.json | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'test') diff --git a/test/tests.json b/test/tests.json index c2de6099d..61914e868 100644 --- a/test/tests.json +++ b/test/tests.json @@ -120,5 +120,14 @@ "upload_date": "20091225", "description": "Installing Gentoo Linux on Powerbook G4, it turns out the sleep indicator becomes HDD activity indicator :D" } + }, + { + "name": "Steam", + "url": "http://store.steampowered.com/video/105600/", + "file": "81300.flv", + "md5": "f870007cee7065d7c76b88f0a45ecc07", + "info_dict": { + "title": "Terraria 1.1 Trailer" + } } ] -- cgit v1.2.3 From 6535e9511fc18eee2fc640c77fd42a4a39791915 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Tue, 1 Jan 2013 16:07:26 +0100 Subject: In tests.json file and md5 join in a 'files' list to handle multiple-file IEs --- test/test_download.py | 19 +++++++------- test/tests.json | 72 +++++++++++++++++++++------------------------------ 2 files changed, 38 insertions(+), 53 deletions(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index 1ee1b334d..5b35c37e7 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -54,9 +54,10 @@ class TestDownload(unittest.TestCase): self.tearDown() def tearDown(self): - for fn in [ test.get('file', False) for test in self.defs ]: - if fn and os.path.exists(fn): - os.remove(fn) + for files in [ test['files'] for test in self.defs ]: + for fn, md5 in files: + if os.path.exists(fn): + os.remove(fn) ### Dinamically generate tests @@ -67,9 +68,6 @@ def generator(test_case): if not ie._WORKING: print('Skipping: IE marked as not _WORKING') return - if not test_case['file']: - print('Skipping: No output file specified') - return if 'skip' in test_case: print('Skipping: {0}'.format(test_case['skip'])) return @@ -84,10 +82,11 @@ def generator(test_case): fd.add_info_extractor(getattr(youtube_dl.InfoExtractors, ien + 'IE')()) fd.download([test_case['url']]) - self.assertTrue(os.path.exists(test_case['file'])) - if 'md5' in test_case: - md5_for_file = _file_md5(test_case['file']) - self.assertEqual(md5_for_file, test_case['md5']) + for filename, md5 in test_case['files']: + self.assertTrue(os.path.exists(filename)) + if md5: + md5_for_file = _file_md5(filename) + self.assertEqual(md5_for_file, md5) info_dict = fd.processed_info_dicts[0] for (info_field, value) in test_case.get('info_dict', {}).items(): if value.startswith('md5:'): diff --git a/test/tests.json b/test/tests.json index 61914e868..7c3986625 100644 --- a/test/tests.json +++ b/test/tests.json @@ -1,8 +1,8 @@ [ { "name": "Youtube", - "url": "http://www.youtube.com/watch?v=BaW_jenozKc", - "file": "BaW_jenozKc.mp4", + "url": "http://www.youtube.com/watch?v=BaW_jenozKc", + "files": [[ "BaW_jenozKc.mp4", false ]], "info_dict": { "title": "youtube-dl test video \"'/\\ä↭𝕐", "uploader": "Philipp Hagemeister", @@ -13,33 +13,29 @@ }, { "name": "Dailymotion", - "md5": "392c4b85a60a90dc4792da41ce3144eb", - "url": "http://www.dailymotion.com/video/x33vw9_tutoriel-de-youtubeur-dl-des-video_tech", - "file": "x33vw9.mp4" + "url": "http://www.dailymotion.com/video/x33vw9_tutoriel-de-youtubeur-dl-des-video_tech", + "files": [[ "x33vw9.mp4", "392c4b85a60a90dc4792da41ce3144eb" ]] }, { "name": "Metacafe", - "add_ie": ["Youtube"], - "url": "http://metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/", - "file": "_aUehQsCQtM.flv" + "add_ie": [ "Youtube" ], + "url": "http://metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/", + "files": [[ "_aUehQsCQtM.flv", false ]] }, { "name": "BlipTV", - "md5": "b2d849efcf7ee18917e4b4d9ff37cafe", - "url": "http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352", - "file": "5779306.m4v" + "url": "http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352", + "files": [[ "5779306.m4v", "b2d849efcf7ee18917e4b4d9ff37cafe" ]] }, { "name": "XVideos", - "md5": "1d0c835822f0a71a7bf011855db929d0", - "url": "http://www.xvideos.com/video939581/funny_porns_by_s_-1", - "file": "939581.flv" + "url": "http://www.xvideos.com/video939581/funny_porns_by_s_-1", + "files": [[ "939581.flv", "1d0c835822f0a71a7bf011855db929d0" ]] }, { "name": "Vimeo", - "md5": "8879b6cc097e987f02484baf890129e5", - "url": "http://vimeo.com/56015672", - "file": "56015672.mp4", + "url": "http://vimeo.com/56015672", + "files": [[ "56015672.mp4", "8879b6cc097e987f02484baf890129e5" ]], "info_dict": { "title": "youtube-dl test video - ★ \" ' 幸 / \\ ä ↭ 𝕐", "uploader": "Filippo Valsorda", @@ -50,70 +46,60 @@ }, { "name": "Soundcloud", - "md5": "ebef0a451b909710ed1d7787dddbf0d7", - "url": "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy", - "file": "62986583.mp3" + "url": "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy", + "files": [[ "62986583.mp3", "ebef0a451b909710ed1d7787dddbf0d7" ]] }, { "name": "StanfordOpenClassroom", - "md5": "544a9468546059d4e80d76265b0443b8", - "url": "http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100", - "file": "PracticalUnix_intro-environment.mp4" + "url": "http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100", + "files": [[ "PracticalUnix_intro-environment.mp4", "544a9468546059d4e80d76265b0443b8" ]] }, { "name": "XNXX", - "md5": "0831677e2b4761795f68d417e0b7b445", - "url": "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_", - "file": "1135332.flv" + "url": "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_", + "files": [[ "1135332.flv", "0831677e2b4761795f68d417e0b7b445" ]] }, { "name": "Youku", "url": "http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html", - "file": "XNDgyMDQ2NTQw_part00.flv", - "md5": "ffe3f2e435663dc2d1eea34faeff5b5b", + "files": [[ "XNDgyMDQ2NTQw_part00.flv", "ffe3f2e435663dc2d1eea34faeff5b5b" ]], "params": { "test": false } }, { "name": "NBA", "url": "http://www.nba.com/video/games/nets/2012/12/04/0021200253-okc-bkn-recap.nba/index.html", - "file": "0021200253-okc-bkn-recap.nba.mp4", - "md5": "c0edcfc37607344e2ff8f13c378c88a4" + "files": [[ "0021200253-okc-bkn-recap.nba.mp4", "c0edcfc37607344e2ff8f13c378c88a4" ]] }, { "name": "JustinTV", "url": "http://www.twitch.tv/thegamedevhub/b/296128360", - "file": "296128360.flv", - "md5": "ecaa8a790c22a40770901460af191c9a" + "files": [[ "296128360.flv", "ecaa8a790c22a40770901460af191c9a" ]] }, { "name": "MyVideo", "url": "http://www.myvideo.de/watch/8229274/bowling_fail_or_win", - "file": "8229274.flv", - "md5": "2d2753e8130479ba2cb7e0a37002053e" + "files": [[ "8229274.flv", "2d2753e8130479ba2cb7e0a37002053e" ]] }, { "name": "Escapist", "url": "http://www.escapistmagazine.com/videos/view/the-escapist-presents/6618-Breaking-Down-Baldurs-Gate", - "file": "6618-Breaking-Down-Baldurs-Gate.flv", - "md5": "c6793dbda81388f4264c1ba18684a74d", + "files": [[ "6618-Breaking-Down-Baldurs-Gate.flv", "c6793dbda81388f4264c1ba18684a74d" ]], "skip": "Fails with timeout on Travis" }, { "name": "GooglePlus", "url": "https://plus.google.com/u/0/108897254135232129896/posts/ZButuJc6CtH", - "file": "ZButuJc6CtH.flv" + "files": [[ "ZButuJc6CtH.flv", false ]] }, { "name": "FunnyOrDie", "url": "http://www.funnyordie.com/videos/0732f586d7/heart-shaped-box-literal-video-version", - "file": "0732f586d7.mp4", - "md5": "f647e9e90064b53b6e046e75d0241fbd" + "files": [[ "0732f586d7.mp4", "f647e9e90064b53b6e046e75d0241fbd" ]] }, { "name": "TweetReel", "url": "http://tweetreel.com/?77smq", - "file": "77smq.mov", - "md5": "56b4d9ca9de467920f3f99a6d91255d6", + "files": [[ "77smq.mov", "56b4d9ca9de467920f3f99a6d91255d6" ]], "info_dict": { "uploader": "itszero", "uploader_id": "itszero", @@ -124,8 +110,8 @@ { "name": "Steam", "url": "http://store.steampowered.com/video/105600/", - "file": "81300.flv", - "md5": "f870007cee7065d7c76b88f0a45ecc07", + "files": [[ "81300.flv", "f870007cee7065d7c76b88f0a45ecc07" ], + [ "80859.flv", "61aaf31a5c5c3041afb58fb83cbb5751" ]], "info_dict": { "title": "Terraria 1.1 Trailer" } -- cgit v1.2.3 From 278986ea0f49b95506277c5f6b4875def231d8bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Tue, 1 Jan 2013 17:52:46 +0100 Subject: ustreamIE --- test/tests.json | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'test') diff --git a/test/tests.json b/test/tests.json index 7c3986625..784e09fb3 100644 --- a/test/tests.json +++ b/test/tests.json @@ -115,5 +115,13 @@ "info_dict": { "title": "Terraria 1.1 Trailer" } + }, + { + "name": "Ustream", + "url": "http://www.ustream.tv/recorded/20274954", + "files": [["20274954.flv", "088f151799e8f572f84eb62f17d73e5c" ]], + "info_dict": { + "title": "Young Americans for Liberty February 7, 2012 2:28 AM" + } } ] -- cgit v1.2.3 From 911ee27e83e1d6b35b4c4f10e6ed9820a925eeda Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 1 Jan 2013 19:07:01 +0100 Subject: typo --- test/test_download.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index 5b35c37e7..238195050 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -60,7 +60,7 @@ class TestDownload(unittest.TestCase): os.remove(fn) -### Dinamically generate tests +### Dynamically generate tests def generator(test_case): def test_template(self): -- cgit v1.2.3 From 6985325e01c6b0b4a0b332dc066f2c00bc32503f Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 1 Jan 2013 19:07:06 +0100 Subject: Revert "In tests.json file and md5 join in a 'files' list to handle multiple-file IEs" This made the JSON structure really unreadable and was a quick fix. This reverts commit 6535e9511fc18eee2fc640c77fd42a4a39791915. --- test/test_download.py | 19 +++++++------- test/tests.json | 72 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 53 insertions(+), 38 deletions(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index 238195050..4ea889740 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -54,10 +54,9 @@ class TestDownload(unittest.TestCase): self.tearDown() def tearDown(self): - for files in [ test['files'] for test in self.defs ]: - for fn, md5 in files: - if os.path.exists(fn): - os.remove(fn) + for fn in [ test.get('file', False) for test in self.defs ]: + if fn and os.path.exists(fn): + os.remove(fn) ### Dynamically generate tests @@ -68,6 +67,9 @@ def generator(test_case): if not ie._WORKING: print('Skipping: IE marked as not _WORKING') return + if not test_case['file']: + print('Skipping: No output file specified') + return if 'skip' in test_case: print('Skipping: {0}'.format(test_case['skip'])) return @@ -82,11 +84,10 @@ def generator(test_case): fd.add_info_extractor(getattr(youtube_dl.InfoExtractors, ien + 'IE')()) fd.download([test_case['url']]) - for filename, md5 in test_case['files']: - self.assertTrue(os.path.exists(filename)) - if md5: - md5_for_file = _file_md5(filename) - self.assertEqual(md5_for_file, md5) + self.assertTrue(os.path.exists(test_case['file'])) + if 'md5' in test_case: + md5_for_file = _file_md5(test_case['file']) + self.assertEqual(md5_for_file, test_case['md5']) info_dict = fd.processed_info_dicts[0] for (info_field, value) in test_case.get('info_dict', {}).items(): if value.startswith('md5:'): diff --git a/test/tests.json b/test/tests.json index 784e09fb3..23843432a 100644 --- a/test/tests.json +++ b/test/tests.json @@ -1,8 +1,8 @@ [ { "name": "Youtube", - "url": "http://www.youtube.com/watch?v=BaW_jenozKc", - "files": [[ "BaW_jenozKc.mp4", false ]], + "url": "http://www.youtube.com/watch?v=BaW_jenozKc", + "file": "BaW_jenozKc.mp4", "info_dict": { "title": "youtube-dl test video \"'/\\ä↭𝕐", "uploader": "Philipp Hagemeister", @@ -13,29 +13,33 @@ }, { "name": "Dailymotion", - "url": "http://www.dailymotion.com/video/x33vw9_tutoriel-de-youtubeur-dl-des-video_tech", - "files": [[ "x33vw9.mp4", "392c4b85a60a90dc4792da41ce3144eb" ]] + "md5": "392c4b85a60a90dc4792da41ce3144eb", + "url": "http://www.dailymotion.com/video/x33vw9_tutoriel-de-youtubeur-dl-des-video_tech", + "file": "x33vw9.mp4" }, { "name": "Metacafe", - "add_ie": [ "Youtube" ], - "url": "http://metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/", - "files": [[ "_aUehQsCQtM.flv", false ]] + "add_ie": ["Youtube"], + "url": "http://metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/", + "file": "_aUehQsCQtM.flv" }, { "name": "BlipTV", - "url": "http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352", - "files": [[ "5779306.m4v", "b2d849efcf7ee18917e4b4d9ff37cafe" ]] + "md5": "b2d849efcf7ee18917e4b4d9ff37cafe", + "url": "http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352", + "file": "5779306.m4v" }, { "name": "XVideos", - "url": "http://www.xvideos.com/video939581/funny_porns_by_s_-1", - "files": [[ "939581.flv", "1d0c835822f0a71a7bf011855db929d0" ]] + "md5": "1d0c835822f0a71a7bf011855db929d0", + "url": "http://www.xvideos.com/video939581/funny_porns_by_s_-1", + "file": "939581.flv" }, { "name": "Vimeo", - "url": "http://vimeo.com/56015672", - "files": [[ "56015672.mp4", "8879b6cc097e987f02484baf890129e5" ]], + "md5": "8879b6cc097e987f02484baf890129e5", + "url": "http://vimeo.com/56015672", + "file": "56015672.mp4", "info_dict": { "title": "youtube-dl test video - ★ \" ' 幸 / \\ ä ↭ 𝕐", "uploader": "Filippo Valsorda", @@ -46,60 +50,70 @@ }, { "name": "Soundcloud", - "url": "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy", - "files": [[ "62986583.mp3", "ebef0a451b909710ed1d7787dddbf0d7" ]] + "md5": "ebef0a451b909710ed1d7787dddbf0d7", + "url": "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy", + "file": "62986583.mp3" }, { "name": "StanfordOpenClassroom", - "url": "http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100", - "files": [[ "PracticalUnix_intro-environment.mp4", "544a9468546059d4e80d76265b0443b8" ]] + "md5": "544a9468546059d4e80d76265b0443b8", + "url": "http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100", + "file": "PracticalUnix_intro-environment.mp4" }, { "name": "XNXX", - "url": "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_", - "files": [[ "1135332.flv", "0831677e2b4761795f68d417e0b7b445" ]] + "md5": "0831677e2b4761795f68d417e0b7b445", + "url": "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_", + "file": "1135332.flv" }, { "name": "Youku", "url": "http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html", - "files": [[ "XNDgyMDQ2NTQw_part00.flv", "ffe3f2e435663dc2d1eea34faeff5b5b" ]], + "file": "XNDgyMDQ2NTQw_part00.flv", + "md5": "ffe3f2e435663dc2d1eea34faeff5b5b", "params": { "test": false } }, { "name": "NBA", "url": "http://www.nba.com/video/games/nets/2012/12/04/0021200253-okc-bkn-recap.nba/index.html", - "files": [[ "0021200253-okc-bkn-recap.nba.mp4", "c0edcfc37607344e2ff8f13c378c88a4" ]] + "file": "0021200253-okc-bkn-recap.nba.mp4", + "md5": "c0edcfc37607344e2ff8f13c378c88a4" }, { "name": "JustinTV", "url": "http://www.twitch.tv/thegamedevhub/b/296128360", - "files": [[ "296128360.flv", "ecaa8a790c22a40770901460af191c9a" ]] + "file": "296128360.flv", + "md5": "ecaa8a790c22a40770901460af191c9a" }, { "name": "MyVideo", "url": "http://www.myvideo.de/watch/8229274/bowling_fail_or_win", - "files": [[ "8229274.flv", "2d2753e8130479ba2cb7e0a37002053e" ]] + "file": "8229274.flv", + "md5": "2d2753e8130479ba2cb7e0a37002053e" }, { "name": "Escapist", "url": "http://www.escapistmagazine.com/videos/view/the-escapist-presents/6618-Breaking-Down-Baldurs-Gate", - "files": [[ "6618-Breaking-Down-Baldurs-Gate.flv", "c6793dbda81388f4264c1ba18684a74d" ]], + "file": "6618-Breaking-Down-Baldurs-Gate.flv", + "md5": "c6793dbda81388f4264c1ba18684a74d", "skip": "Fails with timeout on Travis" }, { "name": "GooglePlus", "url": "https://plus.google.com/u/0/108897254135232129896/posts/ZButuJc6CtH", - "files": [[ "ZButuJc6CtH.flv", false ]] + "file": "ZButuJc6CtH.flv" }, { "name": "FunnyOrDie", "url": "http://www.funnyordie.com/videos/0732f586d7/heart-shaped-box-literal-video-version", - "files": [[ "0732f586d7.mp4", "f647e9e90064b53b6e046e75d0241fbd" ]] + "file": "0732f586d7.mp4", + "md5": "f647e9e90064b53b6e046e75d0241fbd" }, { "name": "TweetReel", "url": "http://tweetreel.com/?77smq", - "files": [[ "77smq.mov", "56b4d9ca9de467920f3f99a6d91255d6" ]], + "file": "77smq.mov", + "md5": "56b4d9ca9de467920f3f99a6d91255d6", "info_dict": { "uploader": "itszero", "uploader_id": "itszero", @@ -110,8 +124,8 @@ { "name": "Steam", "url": "http://store.steampowered.com/video/105600/", - "files": [[ "81300.flv", "f870007cee7065d7c76b88f0a45ecc07" ], - [ "80859.flv", "61aaf31a5c5c3041afb58fb83cbb5751" ]], + "file": "81300.flv", + "md5": "f870007cee7065d7c76b88f0a45ecc07", "info_dict": { "title": "Terraria 1.1 Trailer" } -- cgit v1.2.3 From 5c892b0ba963713bd75d1c85698a660d9bc4bb05 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 1 Jan 2013 19:30:29 +0100 Subject: Adapt test_download to support playlists, and remove race conditions --- test/parameters.json | 2 +- test/test_download.py | 59 +++++++++++++++++++++++++++++++-------------------- test/tests.json | 24 +++++++++++++++------ 3 files changed, 55 insertions(+), 30 deletions(-) (limited to 'test') diff --git a/test/parameters.json b/test/parameters.json index c2082df10..8215d25c5 100644 --- a/test/parameters.json +++ b/test/parameters.json @@ -35,6 +35,6 @@ "username": null, "verbose": true, "writedescription": false, - "writeinfojson": false, + "writeinfojson": true, "writesubtitles": false } \ No newline at end of file diff --git a/test/test_download.py b/test/test_download.py index 4ea889740..128ff9ae4 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -1,5 +1,6 @@ #!/usr/bin/env python +import errno import hashlib import io import os @@ -26,6 +27,14 @@ proxy_handler = compat_urllib_request.ProxyHandler() opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler()) compat_urllib_request.install_opener(opener) +def _try_rm(filename): + """ Remove a file if it exists """ + try: + os.remove(filename) + except OSError as ose: + if ose.errno != errno.ENOENT: + raise + class FileDownloader(youtube_dl.FileDownloader): def __init__(self, *args, **kwargs): self.to_stderr = self.to_screen @@ -50,15 +59,6 @@ class TestDownload(unittest.TestCase): self.parameters = parameters self.defs = defs - # Clear old files - self.tearDown() - - def tearDown(self): - for fn in [ test.get('file', False) for test in self.defs ]: - if fn and os.path.exists(fn): - os.remove(fn) - - ### Dynamically generate tests def generator(test_case): @@ -67,7 +67,7 @@ def generator(test_case): if not ie._WORKING: print('Skipping: IE marked as not _WORKING') return - if not test_case['file']: + if 'playlist' not in test_case and not test_case['file']: print('Skipping: No output file specified') return if 'skip' in test_case: @@ -82,19 +82,32 @@ def generator(test_case): fd.add_info_extractor(ie()) for ien in test_case.get('add_ie', []): fd.add_info_extractor(getattr(youtube_dl.InfoExtractors, ien + 'IE')()) - fd.download([test_case['url']]) - - self.assertTrue(os.path.exists(test_case['file'])) - if 'md5' in test_case: - md5_for_file = _file_md5(test_case['file']) - self.assertEqual(md5_for_file, test_case['md5']) - info_dict = fd.processed_info_dicts[0] - for (info_field, value) in test_case.get('info_dict', {}).items(): - if value.startswith('md5:'): - md5_info_value = hashlib.md5(info_dict.get(info_field, '')).hexdigest() - self.assertEqual(value[3:], md5_info_value) - else: - self.assertEqual(value, info_dict.get(info_field)) + + test_cases = test_case.get('playlist', [test_case]) + for tc in test_cases: + _try_rm(tc['file']) + _try_rm(tc['file'] + '.info.json') + try: + fd.download([test_case['url']]) + + for tc in test_cases: + self.assertTrue(os.path.exists(tc['file'])) + self.assertTrue(os.path.exists(tc['file'] + '.info.json')) + if 'md5' in tc: + md5_for_file = _file_md5(tc['file']) + self.assertEqual(md5_for_file, tc['md5']) + with io.open(tc['file'] + '.info.json', encoding='utf-8') as infof: + info_dict = json.load(infof) + for (info_field, value) in tc.get('info_dict', {}).items(): + if value.startswith('md5:'): + md5_info_value = hashlib.md5(info_dict.get(info_field, '')).hexdigest() + self.assertEqual(value[3:], md5_info_value) + else: + self.assertEqual(value, info_dict.get(info_field)) + finally: + for tc in test_cases: + _try_rm(tc['file']) + _try_rm(tc['file'] + '.info.json') return test_template diff --git a/test/tests.json b/test/tests.json index 23843432a..1d7707033 100644 --- a/test/tests.json +++ b/test/tests.json @@ -124,16 +124,28 @@ { "name": "Steam", "url": "http://store.steampowered.com/video/105600/", - "file": "81300.flv", - "md5": "f870007cee7065d7c76b88f0a45ecc07", - "info_dict": { - "title": "Terraria 1.1 Trailer" - } + "playlist": [ + { + "file": "81300.flv", + "md5": "f870007cee7065d7c76b88f0a45ecc07", + "info_dict": { + "title": "Terraria 1.1 Trailer" + } + }, + { + "file": "80859.flv", + "md5": "61aaf31a5c5c3041afb58fb83cbb5751", + "info_dict": { + "title": "Terraria Trailer" + } + } + ] }, { "name": "Ustream", "url": "http://www.ustream.tv/recorded/20274954", - "files": [["20274954.flv", "088f151799e8f572f84eb62f17d73e5c" ]], + "file": "20274954.flv", + "md5": "088f151799e8f572f84eb62f17d73e5c", "info_dict": { "title": "Young Americans for Liberty February 7, 2012 2:28 AM" } -- cgit v1.2.3 From c073e35b1ed738461eba5cc539923d8fa539b03a Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 1 Jan 2013 19:34:54 +0100 Subject: Simplify test parameter initialization --- test/test_download.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index 128ff9ae4..8b9b83373 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -74,9 +74,8 @@ def generator(test_case): print('Skipping: {0}'.format(test_case['skip'])) return - params = dict(self.parameters) # Duplicate it locally - for p in test_case.get('params', {}): - params[p] = test_case['params'][p] + params = self.parameters.copy() + params.update(test_case.get('params', {})) fd = FileDownloader(params) fd.add_info_extractor(ie()) -- cgit v1.2.3 From 511eda8eda5486ae7ea0ac685197d009164425f7 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 1 Jan 2013 21:01:49 +0100 Subject: add test for infoq --- test/test_download.py | 3 ++- test/tests.json | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index 8b9b83373..4a59f6638 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -90,7 +90,8 @@ def generator(test_case): fd.download([test_case['url']]) for tc in test_cases: - self.assertTrue(os.path.exists(tc['file'])) + if not test_case.get('params', {}).get('skip_download', False): + self.assertTrue(os.path.exists(tc['file'])) self.assertTrue(os.path.exists(tc['file'] + '.info.json')) if 'md5' in tc: md5_for_file = _file_md5(tc['file']) diff --git a/test/tests.json b/test/tests.json index 1d7707033..cd72a88e3 100644 --- a/test/tests.json +++ b/test/tests.json @@ -149,5 +149,16 @@ "info_dict": { "title": "Young Americans for Liberty February 7, 2012 2:28 AM" } + }, + { + "name": "InfoQ", + "url": "http://www.infoq.com/presentations/A-Few-of-My-Favorite-Python-Things", + "file": "12-jan-pythonthings.mp4", + "info_dict": { + "title": "A Few of My Favorite [Python] Things" + }, + "params": { + "skip_download": true + } } ] -- cgit v1.2.3 From 3a648b209c11ea76ae72ef5bc6c02550cdd3ba0f Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 1 Jan 2013 21:15:52 +0100 Subject: Remove .part files before and after tests --- test/test_download.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index 4a59f6638..40d596fdf 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -85,6 +85,7 @@ def generator(test_case): test_cases = test_case.get('playlist', [test_case]) for tc in test_cases: _try_rm(tc['file']) + _try_rm(tc['file'] + '.part') _try_rm(tc['file'] + '.info.json') try: fd.download([test_case['url']]) @@ -107,6 +108,7 @@ def generator(test_case): finally: for tc in test_cases: _try_rm(tc['file']) + _try_rm(tc['file'] + '.part') _try_rm(tc['file'] + '.info.json') return test_template -- cgit v1.2.3