Merge tag 'upstream/2015.07.21'

[youtubedl] / test / helper.py

diff --git a/test/helper.py b/test/helper.py
index 12afdf184f0215e9947515cd3a8516ccad2e480e..e1129e58f44c9f5118b16a52dacdd869d3dd0123 100644 (file)
--- a/test/helper.py
+++ b/test/helper.py
@@ -150,7 +150,7 @@ def expect_info_dict(self, got_dict, expected_dict):
                              'invalid value for field %s, expected %r, got %r' % (info_field, expected, got))
 
     # Check for the presence of mandatory fields
-    if got_dict.get('_type') != 'playlist':
+    if got_dict.get('_type') not in ('playlist', 'multi_video'):
         for key in ('id', 'url', 'title', 'ext'):
             self.assertTrue(got_dict.get(key), 'Missing mandatory field %s' % key)
     # Check for mandatory fields that are automatically set by YoutubeDL