summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-10-18 00:27:51 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-10-18 00:27:51 +0200
commit5d254f776a4d306961b6d22d8f7615844ef64390 (patch)
tree5d98be2464013f0b5d0d7e6f12ca8988a6511ff7
parent1c1218fefcbabb49a0d06fc45d64a299920460ec (diff)
downloadyoutube-dl-5d254f776a4d306961b6d22d8f7615844ef64390.tar.gz
youtube-dl-5d254f776a4d306961b6d22d8f7615844ef64390.tar.xz
youtube-dl-5d254f776a4d306961b6d22d8f7615844ef64390.zip
Fix test
-rw-r--r--test/test_YoutubeDL.py25
1 files changed, 18 insertions, 7 deletions
diff --git a/test/test_YoutubeDL.py b/test/test_YoutubeDL.py
index 2b9fb92ee..ee210ed23 100644
--- a/test/test_YoutubeDL.py
+++ b/test/test_YoutubeDL.py
@@ -1,27 +1,32 @@
 #!/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__()
         self.downloaded_info_dicts = []
+
     def process_info(self, info_dict):
         self.downloaded_info_dicts.append(info_dict)
 
+
 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 +35,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,7 +47,10 @@ 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]