projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[vimeo] Ignore video 'base' thumbnail (Closes #3438)
[youtube-dl]
/
test
/
helper.py
diff --git
a/test/helper.py
b/test/helper.py
index d5e0a603e38285109f4892587ccfb9edffcb901d..b7299fb82c2e541fc520ba11c5c52d9edcc972e3 100644
(file)
--- a/
test/helper.py
+++ b/
test/helper.py
@@
-107,7
+107,7
@@
def expect_info_dict(self, expected_dict, got_dict):
elif isinstance(expected, type):
got = got_dict.get(info_field)
self.assertTrue(isinstance(got, expected),
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' % (expecte
d, got, type(got)))
+ u'Expected type %r
for field %s, but got value %r of type %r' % (expected, info_fiel
d, got, type(got)))
else:
if isinstance(expected, compat_str) and expected.startswith('md5:'):
got = 'md5:' + md5(got_dict.get(info_field))
else:
if isinstance(expected, compat_str) and expected.startswith('md5:'):
got = 'md5:' + md5(got_dict.get(info_field))
@@
-137,8
+137,8
@@
def expect_info_dict(self, expected_dict, got_dict):
def assertRegexpMatches(self, text, regexp, msg=None):
def assertRegexpMatches(self, text, regexp, msg=None):
- if hasattr(self, 'assertRegexp
Matches
'):
- return self.assertRegexp
Matches
(text, regexp, msg)
+ if hasattr(self, 'assertRegexp'):
+ return self.assertRegexp(text, regexp, msg)
else:
m = re.match(regexp, text)
if not m:
else:
m = re.match(regexp, text)
if not m:
@@
-148,3
+148,10
@@
def assertRegexpMatches(self, text, regexp, msg=None):
else:
msg = note + ', ' + msg
self.assertTrue(m, msg)
else:
msg = note + ', ' + msg
self.assertTrue(m, msg)
+
+
+def assertGreaterEqual(self, got, expected, msg=None):
+ if not (got >= expected):
+ if msg is None:
+ msg = '%r not greater than or equal to %r' % (got, expected)
+ self.assertTrue(got >= expected, msg)