about summary refs log tree commit diff
path: root/test/test_youtube_lists.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-06-27 00:09:05 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-06-27 00:09:05 +0200
commit112da0a0ced71d56db8a1f02a43197b78ca0a851 (patch)
tree5e55fba26faa53b09b19ef17b8a9c973c1b4a8aa /test/test_youtube_lists.py
parentbcd606c0feb565b260e0231a655c6fc16e439698 (diff)
downloadyoutube-dl-112da0a0ced71d56db8a1f02a43197b78ca0a851.tar.gz
youtube-dl-112da0a0ced71d56db8a1f02a43197b78ca0a851.tar.xz
youtube-dl-112da0a0ced71d56db8a1f02a43197b78ca0a851.zip
Simplify FakeYDL
Diffstat (limited to 'test/test_youtube_lists.py')
-rw-r--r--test/test_youtube_lists.py24
1 files changed, 1 insertions, 23 deletions
diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py
index 320b44082..4486b7eb0 100644
--- a/test/test_youtube_lists.py
+++ b/test/test_youtube_lists.py
@@ -10,30 +10,8 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from youtube_dl.extractor import YoutubeUserIE, YoutubePlaylistIE, YoutubeIE, YoutubeChannelIE
 from youtube_dl.utils import *
-from youtube_dl import YoutubeDL
 
-PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
-with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
-    parameters = json.load(pf)
-
-# General configuration (from __init__, not very elegant...)
-jar = compat_cookiejar.CookieJar()
-cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar)
-proxy_handler = compat_urllib_request.ProxyHandler()
-opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler())
-compat_urllib_request.install_opener(opener)
-
-class FakeYDL(YoutubeDL):
-    def __init__(self):
-        self.result = []
-        self.params = parameters
-    def to_screen(self, s):
-        print(s)
-    def trouble(self, s, tb=None):
-        raise Exception(s)
-    def extract_info(self, url):
-        self.result.append(url)
-        return url
+from helper import FakeYDL
 
 class TestYoutubeLists(unittest.TestCase):
     def assertIsPlaylist(self,info):