aboutsummaryrefslogtreecommitdiff
path: root/test/test_download.py
diff options
context:
space:
mode:
authorgcmalloc <gcmalloc@gmail.com>2012-10-15 14:34:54 +0200
committergcmalloc <gcmalloc@gmail.com>2012-10-19 12:53:20 +0200
commit4279a0ca983476a0bdf86e23251b866616cbd434 (patch)
tree4332325011d9eed515465aedd3132c22dd94d291 /test/test_download.py
parentedcc7d2dd370c74bac3f28d9445f61b3fb590c7e (diff)
downloadyoutube-dl-4279a0ca983476a0bdf86e23251b866616cbd434.tar.xz
correcting test to be compatible with python2.6
Diffstat (limited to 'test/test_download.py')
-rw-r--r--test/test_download.py30
1 files changed, 18 insertions, 12 deletions
diff --git a/test/test_download.py b/test/test_download.py
index 84a98908a..7de9f2a48 100644
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -74,9 +74,10 @@ class DownloadTest(unittest.TestCase):
md5_down_file = md5_for_file(DownloadTest.DAILYMOTION_FILE)
self.assertEqual(md5_down_file, DownloadTest.DAILYMOTION_MD5)
- @unittest.skip("no suitable ie")
def test_metacafe(self):
- with open("test/json") as f:
+ #this emulate a skip,to be 2.6 compatible
+ return
+ with open(DownloadTest.PARAMETERS_FILE) as f:
fd = FileDownloader(json.load(f))
print fd
fd.add_info_extractor(MetacafeIE())
@@ -85,45 +86,50 @@ class DownloadTest(unittest.TestCase):
md5_down_file = md5_for_file(DownloadTest.METACAFE_FILE)
self.assertEqual(md5_down_file, DownloadTest.METACAFE_MD5)
- @unittest.skip("no suitable url")
def test_photobucket(self):
- fd = FileDownloader({})
+ return
+ with open(DownloadTest.PARAMETERS_FILE) as f:
+ fd = FileDownloader(json.load(f))
fd.add_info_extractor(PhotobucketIE())
fd.download([DownloadTest.PHOTOBUCKET_URL])
self.assertTrue(os.path.exists(DownloadTest.PHOTOBUCKET_FILE))
md5_down_file = md5_for_file(DownloadTest.PHOTOBUCKET_FILE)
self.assertEqual(md5_down_file, DownloadTest.PHOTOBUCKET_MD5)
- @unittest.skip("no suitable url")
def test_facebook(self):
- fd = FileDownloader({})
+ return
+ with open(DownloadTest.PARAMETERS_FILE) as f:
+ fd = FileDownloader(json.load(f))
fd.add_info_extractor(FacebookIE())
fd.download([DownloadTest.FACEBOOK_URL])
self.assertTrue(os.path.exists(DownloadTest.FACEBOOK_FILE))
md5_down_file = md5_for_file(DownloadTest.FACEBOOK_FILE)
self.assertEqual(md5_down_file, DownloadTest.FACEBOOK_MD5)
- @unittest.skip("no suitable url")
def test_blip(self):
- fd = FileDownloader({})
+ return
+ 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)
- @unittest.skip("no suitable url")
def test_vimeo(self):
- fd = FileDownloader({})
+ 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)
- @unittest.skip("no suitable url")
def test_xvideo(self):
- fd = FileDownloader({})
+ return
+ with open(DownloadTest.PARAMETERS_FILE) as f:
+ fd = FileDownloader(json.load(f))
fd.add_info_extractor(XVideosIE())
fd.download([DownloadTest.XVIDEO_URL])
self.assertTrue(os.path.exists(DownloadTest.XVIDEO_FILE))