aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-03-17 14:30:13 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-03-17 14:30:13 +0100
commitff14fc496401b3318339e108f3db2825622c44c3 (patch)
tree15e8ab1364183696ee2ca93ac4467b3e0c12de34
parente125c215318d6bac1e96b0177ccd62660b16884c (diff)
[test] Rename get_testcases to gettestcases
Apparently, newer versions of nosetests are somewhat over-eager in their test discovery.
-rw-r--r--test/helper.py2
-rw-r--r--test/test_all_urls.py4
-rw-r--r--test/test_download.py4
3 files changed, 5 insertions, 5 deletions
diff --git a/test/helper.py b/test/helper.py
index b1f421ac5..17de951c5 100644
--- a/test/helper.py
+++ b/test/helper.py
@@ -71,7 +71,7 @@ class FakeYDL(YoutubeDL):
old_report_warning(message)
self.report_warning = types.MethodType(report_warning, self)
-def get_testcases():
+def gettestcases():
for ie in youtube_dl.extractor.gen_extractors():
t = getattr(ie, '_TEST', None)
if t:
diff --git a/test/test_all_urls.py b/test/test_all_urls.py
index 047e84f19..3ce0b910a 100644
--- a/test/test_all_urls.py
+++ b/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__))))
-from test.helper import get_testcases
+from test.helper import gettestcases
from youtube_dl.extractor import (
FacebookIE,
@@ -105,7 +105,7 @@ class TestAllURLsMatching(unittest.TestCase):
def test_no_duplicates(self):
ies = gen_extractors()
- for tc in get_testcases():
+ for tc in gettestcases():
url = tc['url']
for ie in ies:
if type(ie).__name__ in ('GenericIE', tc['name'] + 'IE'):
diff --git a/test/test_download.py b/test/test_download.py
index ca8c82f71..8fccdaf9e 100644
--- a/test/test_download.py
+++ b/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 (
get_params,
- get_testcases,
+ gettestcases,
try_rm,
md5,
report_warning
@@ -51,7 +51,7 @@ def _file_md5(fn):
with open(fn, 'rb') as f:
return hashlib.md5(f.read()).hexdigest()
-defs = get_testcases()
+defs = gettestcases()
class TestDownload(unittest.TestCase):