Merge tag 'upstream/2014.07.11'

[youtubedl] / test / test_youtube_lists.py

diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py
index 38ac989ce706a347e575f62a9dd6b60b8fece8c9..3aadedd64cf5af38ab1d18b640b10301c2073de2 100644 (file)
--- a/test/test_youtube_lists.py
+++ b/test/test_youtube_lists.py
@@ -16,6 +16,7 @@ from youtube_dl.extractor import (
     YoutubeChannelIE,
     YoutubeShowIE,
     YoutubeTopListIE,
     YoutubeChannelIE,
     YoutubeShowIE,
     YoutubeTopListIE,

+    YoutubeSearchURLIE,

 )
 
 
 )
 
 


@@ -111,13 +112,15 @@ class TestYoutubeLists(unittest.TestCase):
     def test_youtube_mix(self):
         dl = FakeYDL()
         ie = YoutubePlaylistIE(dl)
     def test_youtube_mix(self):
         dl = FakeYDL()
         ie = YoutubePlaylistIE(dl)

-        result = ie.extract('http://www.youtube.com/watch?v=lLJf9qJHR3E&list=RDrjFaenf1T-Y')
+        result = ie.extract('https://www.youtube.com/watch?v=W01L70IGBgE&index=2&list=RDOQpdSVF_k_w')

         entries = result['entries']
         self.assertTrue(len(entries) >= 20)
         original_video = entries[0]
         entries = result['entries']
         self.assertTrue(len(entries) >= 20)
         original_video = entries[0]

-        self.assertEqual(original_video['id'], 'rjFaenf1T-Y')
+        self.assertEqual(original_video['id'], 'OQpdSVF_k_w')

 
     def test_youtube_toptracks(self):
 
     def test_youtube_toptracks(self):

+        print('Skipping: The playlist page gives error 500')
+        return

         dl = FakeYDL()
         ie = YoutubePlaylistIE(dl)
         result = ie.extract('https://www.youtube.com/playlist?list=MCUS')
         dl = FakeYDL()
         ie = YoutubePlaylistIE(dl)
         result = ie.extract('https://www.youtube.com/playlist?list=MCUS')


@@ -131,5 +134,14 @@ class TestYoutubeLists(unittest.TestCase):
         entries = result['entries']
         self.assertTrue(len(entries) >= 5)
 
         entries = result['entries']
         self.assertTrue(len(entries) >= 5)
 

+    def test_youtube_search_url(self):
+        dl = FakeYDL()
+        ie = YoutubeSearchURLIE(dl)
+        result = ie.extract('https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video')
+        entries = result['entries']
+        self.assertIsPlaylist(result)
+        self.assertEqual(result['title'], 'youtube-dl test video')
+        self.assertTrue(len(entries) >= 5)
+

 if __name__ == '__main__':
     unittest.main()
 if __name__ == '__main__':
     unittest.main()