X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=test%2Fhelper.py;h=b7299fb82c2e541fc520ba11c5c52d9edcc972e3;hb=201e9eaa0e7298f50fc98555c871d4458870680f;hp=230d2bd67ab06b4db552bff30c5620f83673ca93;hpb=948bcc60df48415ddbf3d7ea03bc3af53a9d928d;p=youtube-dl diff --git a/test/helper.py b/test/helper.py index 230d2bd67..b7299fb82 100644 --- a/test/helper.py +++ b/test/helper.py @@ -137,8 +137,8 @@ def expect_info_dict(self, expected_dict, got_dict): def assertRegexpMatches(self, text, regexp, msg=None): - if hasattr(self, 'assertRegexpMatches'): - return self.assertRegexpMatches(text, regexp, msg) + if hasattr(self, 'assertRegexp'): + return self.assertRegexp(text, regexp, msg) 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) + + +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)