Merge tag 'upstream/2013.10.04'

[youtubedl] / test / test_download.py

diff --git a/test/test_download.py b/test/test_download.py
index 067bde4bb9159f4d56ae34bbc4690a8425a11550..23a66254d86ed2a68ee3ea54339838fda7d5dc71 100644 (file)
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -14,10 +14,8 @@ import binascii
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import youtube_dl.YoutubeDL
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import youtube_dl.YoutubeDL

-import youtube_dl.extractor

 from youtube_dl.utils import *
 
 from youtube_dl.utils import *
 

-DEF_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'tests.json')

 PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
 
 RETRIES = 3
 PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
 
 RETRIES = 3


@@ -56,8 +54,9 @@ def _file_md5(fn):
     with open(fn, 'rb') as f:
         return hashlib.md5(f.read()).hexdigest()
 
     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)
+from helper import get_testcases
+defs = get_testcases()
+

 with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
     parameters = json.load(pf)
 
 with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
     parameters = json.load(pf)
 


@@ -73,22 +72,23 @@ def generator(test_case):
 
     def test_template(self):
         ie = youtube_dl.extractor.get_info_extractor(test_case['name'])
 
     def test_template(self):
         ie = youtube_dl.extractor.get_info_extractor(test_case['name'])

+        def print_skipping(reason):
+            print('Skipping %s: %s' % (test_case['name'], reason))

         if not ie._WORKING:
         if not ie._WORKING:

-            print('Skipping: IE marked as not _WORKING')
+            print_skipping('IE marked as not _WORKING')

             return
         if 'playlist' not in test_case and not test_case['file']:
             return
         if 'playlist' not in test_case and not test_case['file']:

-            print('Skipping: No output file specified')
+            print_skipping('No output file specified')

             return
         if 'skip' in test_case:
             return
         if 'skip' in test_case:

-            print('Skipping: {0}'.format(test_case['skip']))
+            print_skipping(test_case['skip'])

             return
 
         params = self.parameters.copy()
         params.update(test_case.get('params', {}))
 
         ydl = YoutubeDL(params)
             return
 
         params = self.parameters.copy()
         params.update(test_case.get('params', {}))
 
         ydl = YoutubeDL(params)

-        for ie in youtube_dl.extractor.gen_extractors():
-            ydl.add_info_extractor(ie)
+        ydl.add_default_info_extractors()

         finished_hook_called = set()
         def _hook(status):
             if status['status'] == 'finished':
         finished_hook_called = set()
         def _hook(status):
             if status['status'] == 'finished':


@@ -127,12 +127,11 @@ def generator(test_case):
                     info_dict = json.load(infof)
                 for (info_field, expected) in tc.get('info_dict', {}).items():
                     if isinstance(expected, compat_str) and expected.startswith('md5:'):
                     info_dict = json.load(infof)
                 for (info_field, expected) in tc.get('info_dict', {}).items():
                     if isinstance(expected, compat_str) and expected.startswith('md5:'):

-                        self.assertEqual(expected, 'md5:' + md5(info_dict.get(info_field)))
+                        got = 'md5:' + md5(info_dict.get(info_field))

                     else:
                         got = info_dict.get(info_field)
                     else:
                         got = info_dict.get(info_field)

-                        self.assertEqual(
-                            expected, got,
-                            u'invalid value for field %s, expected %r, got %r' % (info_field, expected, got))
+                    self.assertEqual(expected, got,
+                        u'invalid value for field %s, expected %r, got %r' % (info_field, expected, got))

 
                 # If checkable fields are missing from the test case, print the info_dict
                 test_info_dict = dict((key, value if not isinstance(value, compat_str) or len(value) < 250 else 'md5:' + md5(value))
 
                 # If checkable fields are missing from the test case, print the info_dict
                 test_info_dict = dict((key, value if not isinstance(value, compat_str) or len(value) < 250 else 'md5:' + md5(value))


@@ -155,9 +154,12 @@ def generator(test_case):
 ### And add them to TestDownload
 for n, test_case in enumerate(defs):
     test_method = generator(test_case)
 ### And add them to TestDownload
 for n, test_case in enumerate(defs):
     test_method = generator(test_case)

-    test_method.__name__ = "test_{0}".format(test_case["name"])
-    if getattr(TestDownload, test_method.__name__, False):
-        test_method.__name__ = "test_{0}_{1}".format(test_case["name"], n)
+    tname = 'test_' + str(test_case['name'])
+    i = 1
+    while hasattr(TestDownload, tname):
+        tname = 'test_'  + str(test_case['name']) + '_' + str(i)
+        i += 1
+    test_method.__name__ = tname

     setattr(TestDownload, test_method.__name__, test_method)
     del test_method
 
     setattr(TestDownload, test_method.__name__, test_method)
     del test_method