From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sun, 19 Apr 2015 11:08:37 +0000 (+0800)
Subject: [tests] Allow multi_video to be tested as playlists
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=880ee801cf8a67643cd0a1130ea46cf3be046bf1;p=youtube-dl

[tests] Allow multi_video to be tested as playlists
---

diff --git a/test/helper.py b/test/helper.py
index 12afdf184..e1129e58f 100644
--- 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
diff --git a/test/test_download.py b/test/test_download.py
index 6a149ae4f..1110357a7 100644
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -153,7 +153,7 @@ def generator(test_case):
                     break
 
             if is_playlist:
-                self.assertEqual(res_dict['_type'], 'playlist')
+                self.assertTrue(res_dict['_type'] in ['playlist', 'multi_video'])
                 self.assertTrue('entries' in res_dict)
                 expect_info_dict(self, res_dict, test_case.get('info_dict', {}))