浏览代码

[test] Rename get_testcases to gettestcases

Apparently, newer versions of nosetests are somewhat over-eager in their test discovery.
Philipp Hagemeister 11 年之前
父节点
当前提交
ff14fc4964
共有 3 个文件被更改,包括 5 次插入5 次删除
  1. 1 1
      test/helper.py
  2. 2 2
      test/test_all_urls.py
  3. 2 2
      test/test_download.py

+ 1 - 1
test/helper.py

@@ -71,7 +71,7 @@ class FakeYDL(YoutubeDL):
             old_report_warning(message)
             old_report_warning(message)
         self.report_warning = types.MethodType(report_warning, self)
         self.report_warning = types.MethodType(report_warning, self)
 
 
-def get_testcases():
+def gettestcases():
     for ie in youtube_dl.extractor.gen_extractors():
     for ie in youtube_dl.extractor.gen_extractors():
         t = getattr(ie, '_TEST', None)
         t = getattr(ie, '_TEST', None)
         if t:
         if t:

+ 2 - 2
test/test_all_urls.py

@@ -9,7 +9,7 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 
 
-from test.helper import get_testcases
+from test.helper import gettestcases
 
 
 from youtube_dl.extractor import (
 from youtube_dl.extractor import (
     FacebookIE,
     FacebookIE,
@@ -105,7 +105,7 @@ class TestAllURLsMatching(unittest.TestCase):
 
 
     def test_no_duplicates(self):
     def test_no_duplicates(self):
         ies = gen_extractors()
         ies = gen_extractors()
-        for tc in get_testcases():
+        for tc in gettestcases():
             url = tc['url']
             url = tc['url']
             for ie in ies:
             for ie in ies:
                 if type(ie).__name__ in ('GenericIE', tc['name'] + 'IE'):
                 if type(ie).__name__ in ('GenericIE', tc['name'] + 'IE'):

+ 2 - 2
test/test_download.py

@@ -8,7 +8,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 from test.helper import (
 from test.helper import (
     get_params,
     get_params,
-    get_testcases,
+    gettestcases,
     try_rm,
     try_rm,
     md5,
     md5,
     report_warning
     report_warning
@@ -51,7 +51,7 @@ def _file_md5(fn):
     with open(fn, 'rb') as f:
     with open(fn, 'rb') as f:
         return hashlib.md5(f.read()).hexdigest()
         return hashlib.md5(f.read()).hexdigest()
 
 
-defs = get_testcases()
+defs = gettestcases()
 
 
 
 
 class TestDownload(unittest.TestCase):
 class TestDownload(unittest.TestCase):