Merge branch 'master' of https://github.com/rg3/youtube-dl

[youtube-dl] / test / test_youtube_lists.py

diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py
index a11a59ed761b58a8cf0b37a584a93642d1d867ff..3044e0852ab52cdaf5dc9c46177c7916dbf2e03e 100644 (file)
--- a/test/test_youtube_lists.py
+++ b/test/test_youtube_lists.py
@@ -2,27 +2,30 @@
 
 import sys
 import unittest
-import socket
+import json
 
 # Allow direct execution
 import os
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.InfoExtractors import YoutubePlaylistIE
+from youtube_dl.InfoExtractors import YoutubeUserIE,YoutubePlaylistIE
 from youtube_dl.utils import *
 
+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)
-socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words)
 
 class FakeDownloader(object):
     def __init__(self):
         self.result = []
-        self.params = {}
+        self.params = parameters
     def to_screen(self, s):
         print(s)
     def trouble(self, s):
@@ -57,12 +60,12 @@ class TestYoutubeLists(unittest.TestCase):
         self.assertEqual(DL.result[-1], ['http://www.youtube.com/watch?v=rYefUsYuEp0'])
 
     def test_youtube_channel(self):
-        """I give up, please find a channel that does paginate and test this like test_youtube_playlist_long"""
+        # I give up, please find a channel that does paginate and test this like test_youtube_playlist_long
         pass # TODO
 
     def test_youtube_user(self):
         DL = FakeDownloader()
-        IE = YoutubePlaylistIE(DL)
+        IE = YoutubeUserIE(DL)
         IE.extract('https://www.youtube.com/user/TheLinuxFoundation')
         self.assertTrue(len(DL.result) >= 320)