X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=test%2Ftest_YoutubeDL.py;h=ba6dc05bc3c5549783d7e93c3226484da2f0602a;hb=16f36a6fc92d6ab89293e45de65475455fbc1b47;hp=2b9fb92ee60712e231699bcc1c6d9f52cc950080;hpb=e028d0d1e3ffed0a323b41431dbbfc804aa9553e;p=youtube-dl

diff --git a/test/test_YoutubeDL.py b/test/test_YoutubeDL.py
index 2b9fb92ee..ba6dc05bc 100644
--- a/test/test_YoutubeDL.py
+++ b/test/test_YoutubeDL.py
@@ -1,27 +1,36 @@
 #!/usr/bin/env python
 
+# Allow direct execution
+import os
 import sys
 import unittest
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-# Allow direct execution
-import os
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from test.helper import FakeYDL
 
-from helper import FakeYDL, parameters
 
 class YDL(FakeYDL):
-    def __init__(self):
-        super(YDL, self).__init__()
+    def __init__(self, *args, **kwargs):
+        super(YDL, self).__init__(*args, **kwargs)
         self.downloaded_info_dicts = []
+        self.msgs = []
+
     def process_info(self, info_dict):
         self.downloaded_info_dicts.append(info_dict)
 
+    def to_screen(self, msg):
+        self.msgs.append(msg)
+
+
 class TestFormatSelection(unittest.TestCase):
     def test_prefer_free_formats(self):
         # Same resolution => download webm
         ydl = YDL()
         ydl.params['prefer_free_formats'] = True
-        formats = [{u'ext': u'webm', u'height': 460},{u'ext': u'mp4',  u'height': 460}]
+        formats = [
+            {u'ext': u'webm', u'height': 460},
+            {u'ext': u'mp4',  u'height': 460},
+        ]
         info_dict = {u'formats': formats, u'extractor': u'test'}
         ydl.process_ie_result(info_dict)
         downloaded = ydl.downloaded_info_dicts[0]
@@ -30,7 +39,10 @@ class TestFormatSelection(unittest.TestCase):
         # Different resolution => download best quality (mp4)
         ydl = YDL()
         ydl.params['prefer_free_formats'] = True
-        formats = [{u'ext': u'webm', u'height': 720},{u'ext': u'mp4',u'height': 1080}]
+        formats = [
+            {u'ext': u'webm', u'height': 720},
+            {u'ext': u'mp4', u'height': 1080},
+        ]
         info_dict[u'formats'] = formats
         ydl.process_ie_result(info_dict)
         downloaded = ydl.downloaded_info_dicts[0]
@@ -39,11 +51,49 @@ class TestFormatSelection(unittest.TestCase):
         # No prefer_free_formats => keep original formats order
         ydl = YDL()
         ydl.params['prefer_free_formats'] = False
-        formats = [{u'ext': u'webm', u'height': 720},{u'ext': u'flv',u'height': 720}]
+        formats = [
+            {u'ext': u'webm', u'height': 720},
+            {u'ext': u'flv', u'height': 720},
+        ]
         info_dict[u'formats'] = formats
         ydl.process_ie_result(info_dict)
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded[u'ext'], u'flv')
 
+    def test_format_limit(self):
+        formats = [
+            {u'format_id': u'meh'},
+            {u'format_id': u'good'},
+            {u'format_id': u'great'},
+            {u'format_id': u'excellent'},
+        ]
+        info_dict = {
+            u'formats': formats, u'extractor': u'test', 'id': 'testvid'}
+
+        ydl = YDL()
+        ydl.process_ie_result(info_dict)
+        downloaded = ydl.downloaded_info_dicts[0]
+        self.assertEqual(downloaded[u'format_id'], u'excellent')
+
+        ydl = YDL({'format_limit': 'good'})
+        assert ydl.params['format_limit'] == 'good'
+        ydl.process_ie_result(info_dict)
+        downloaded = ydl.downloaded_info_dicts[0]
+        self.assertEqual(downloaded[u'format_id'], u'good')
+
+        ydl = YDL({'format_limit': 'great', 'format': 'all'})
+        ydl.process_ie_result(info_dict)
+        self.assertEqual(ydl.downloaded_info_dicts[0][u'format_id'], u'meh')
+        self.assertEqual(ydl.downloaded_info_dicts[1][u'format_id'], u'good')
+        self.assertEqual(ydl.downloaded_info_dicts[2][u'format_id'], u'great')
+        self.assertTrue('3' in ydl.msgs[0])
+
+        ydl = YDL()
+        ydl.params['format_limit'] = 'excellent'
+        ydl.process_ie_result(info_dict)
+        downloaded = ydl.downloaded_info_dicts[0]
+        self.assertEqual(downloaded[u'format_id'], u'excellent')
+
+
 if __name__ == '__main__':
     unittest.main()