From 5d254f776a4d306961b6d22d8f7615844ef64390 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 18 Oct 2013 00:27:51 +0200
Subject: [PATCH] Fix test

---
 test/test_YoutubeDL.py | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 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
 
-import sys
-import unittest
-
 # Allow direct execution
 import os
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+import sys
+import unittest
+sys.path.insert(0, 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]