diff options
| author | Sergey M. <dstftw@gmail.com> | 2015-08-08 05:47:33 +0600 |
|---|---|---|
| committer | Sergey M. <dstftw@gmail.com> | 2015-08-08 05:47:33 +0600 |
| commit | d5d7bdaeb517f389fff5a6557f072f3586e3c440 (patch) | |
| tree | df563efcd8f182f5af9719666b286211c6010681 /test | |
| parent | b2f82948ee5eadc483c01dc589b82426bb32ba68 (diff) | |
| parent | d41d04c0f513ad3b83ab6aee60cf2201710b6063 (diff) | |
| download | youtube-dl-d5d7bdaeb517f389fff5a6557f072f3586e3c440.tar.xz | |
Merge pull request #6428 from dstftw/improve-generic-smil-support
Improve generic SMIL support
Diffstat (limited to 'test')
| -rw-r--r-- | test/helper.py | 4 | ||||
| -rw-r--r-- | test/test_download.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/helper.py b/test/helper.py index e1129e58f..c8b34654d 100644 --- a/test/helper.py +++ b/test/helper.py @@ -133,8 +133,8 @@ def expect_info_dict(self, got_dict, expected_dict): elif isinstance(expected, compat_str) and expected.startswith('mincount:'): got = got_dict.get(info_field) self.assertTrue( - isinstance(got, list), - 'Expected field %s to be a list, but it is of type %s' % ( + isinstance(got, (list, dict)), + 'Expected field %s to be a list or a dict, but it is of type %s' % ( info_field, type(got).__name__)) expected_num = int(expected.partition(':')[2]) assertGreaterEqual( diff --git a/test/test_download.py b/test/test_download.py index 1110357a7..284418834 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -136,7 +136,9 @@ def generator(test_case): # We're not using .download here sine that is just a shim # for outside error handling, and returns the exit code # instead of the result dict. - res_dict = ydl.extract_info(test_case['url']) + res_dict = ydl.extract_info( + test_case['url'], + force_generic_extractor=params.get('force_generic_extractor', False)) except (DownloadError, ExtractorError) as err: # Check if the exception is not a network related one if not err.exc_info[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError, compat_http_client.BadStatusLine) or (err.exc_info[0] == compat_HTTPError and err.exc_info[1].code == 503): |