mirror of
https://github.com/blackjack4494/yt-dlc.git
synced 2024-08-18 08:19:39 +02:00
[test] Move expect_info_dict out of test_download
This commit is contained in:
parent
6eefe53329
commit
257cfebfe6
@ -9,7 +9,10 @@ import sys
|
|||||||
|
|
||||||
import youtube_dl.extractor
|
import youtube_dl.extractor
|
||||||
from youtube_dl import YoutubeDL
|
from youtube_dl import YoutubeDL
|
||||||
from youtube_dl.utils import preferredencoding
|
from youtube_dl.utils import (
|
||||||
|
compat_str,
|
||||||
|
preferredencoding,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def get_params(override=None):
|
def get_params(override=None):
|
||||||
@ -83,3 +86,27 @@ def gettestcases():
|
|||||||
|
|
||||||
|
|
||||||
md5 = lambda s: hashlib.md5(s.encode('utf-8')).hexdigest()
|
md5 = lambda s: hashlib.md5(s.encode('utf-8')).hexdigest()
|
||||||
|
|
||||||
|
|
||||||
|
def expect_info_dict(self, expected_dict, got_dict):
|
||||||
|
for info_field, expected in expected_dict.items():
|
||||||
|
if isinstance(expected, compat_str) and expected.startswith('re:'):
|
||||||
|
got = got_dict.get(info_field)
|
||||||
|
match_str = expected[len('re:'):]
|
||||||
|
match_rex = re.compile(match_str)
|
||||||
|
|
||||||
|
self.assertTrue(
|
||||||
|
isinstance(got, compat_str) and match_rex.match(got),
|
||||||
|
u'field %s (value: %r) should match %r' % (info_field, got, match_str))
|
||||||
|
elif isinstance(expected, type):
|
||||||
|
got = got_dict.get(info_field)
|
||||||
|
self.assertTrue(isinstance(got, expected),
|
||||||
|
u'Expected type %r, but got value %r of type %r' % (expected, got, type(got)))
|
||||||
|
else:
|
||||||
|
if isinstance(expected, compat_str) and expected.startswith('md5:'):
|
||||||
|
got = 'md5:' + md5(got_dict.get(info_field))
|
||||||
|
else:
|
||||||
|
got = got_dict.get(info_field)
|
||||||
|
self.assertEqual(expected, got,
|
||||||
|
u'invalid value for field %s, expected %r, got %r' % (info_field, expected, got))
|
||||||
|
|
||||||
|
@ -9,16 +9,16 @@ 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,
|
||||||
gettestcases,
|
gettestcases,
|
||||||
try_rm,
|
expect_info_dict,
|
||||||
md5,
|
md5,
|
||||||
report_warning
|
try_rm,
|
||||||
|
report_warning,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
import hashlib
|
import hashlib
|
||||||
import io
|
import io
|
||||||
import json
|
import json
|
||||||
import re
|
|
||||||
import socket
|
import socket
|
||||||
|
|
||||||
import youtube_dl.YoutubeDL
|
import youtube_dl.YoutubeDL
|
||||||
@ -135,26 +135,8 @@ def generator(test_case):
|
|||||||
self.assertEqual(md5_for_file, tc['md5'])
|
self.assertEqual(md5_for_file, tc['md5'])
|
||||||
with io.open(info_json_fn, encoding='utf-8') as infof:
|
with io.open(info_json_fn, encoding='utf-8') as infof:
|
||||||
info_dict = json.load(infof)
|
info_dict = json.load(infof)
|
||||||
for (info_field, expected) in tc.get('info_dict', {}).items():
|
|
||||||
if isinstance(expected, compat_str) and expected.startswith('re:'):
|
|
||||||
got = info_dict.get(info_field)
|
|
||||||
match_str = expected[len('re:'):]
|
|
||||||
match_rex = re.compile(match_str)
|
|
||||||
|
|
||||||
self.assertTrue(
|
expect_info_dict(self, tc.get('info_dict', {}), info_dict)
|
||||||
isinstance(got, compat_str) and match_rex.match(got),
|
|
||||||
u'field %s (value: %r) should match %r' % (info_field, got, match_str))
|
|
||||||
elif isinstance(expected, type):
|
|
||||||
got = info_dict.get(info_field)
|
|
||||||
self.assertTrue(isinstance(got, expected),
|
|
||||||
u'Expected type %r, but got value %r of type %r' % (expected, got, type(got)))
|
|
||||||
else:
|
|
||||||
if isinstance(expected, compat_str) and expected.startswith('md5:'):
|
|
||||||
got = 'md5:' + md5(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))
|
|
||||||
|
|
||||||
# Check for the presence of mandatory fields
|
# Check for the presence of mandatory fields
|
||||||
for key in ('id', 'url', 'title', 'ext'):
|
for key in ('id', 'url', 'title', 'ext'):
|
||||||
|
Loading…
Reference in New Issue
Block a user