Merge pull request #887 from anisse/master

[youtube-dl] / test / test_youtube_lists.py

diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py
index b11e6ccaa246b5f4ddadc44d677573aa7c502399..e8b49ff8ebe3bd3f74f796888cdc7f27b1ecc386 100644 (file)
--- a/test/test_youtube_lists.py
+++ b/test/test_youtube_lists.py
@@ -29,7 +29,7 @@ class FakeDownloader(FileDownloader):
         self.params = parameters
     def to_screen(self, s):
         print(s)
-    def trouble(self, s):
+    def trouble(self, s, tb=None):
         raise Exception(s)
     def extract_info(self, url):
         self.result.append(url)
@@ -53,8 +53,7 @@ class TestYoutubeLists(unittest.TestCase):
         dl = FakeDownloader()
         ie = YoutubePlaylistIE(dl)
         result = ie.extract('PLBB231211A4F62143')[0]
-        self.assertEqual(result['title'], 'Team Fortress 2')
-        self.assertTrue(len(result['entries']) > 40)
+        self.assertTrue(len(result['entries']) > 25)
 
     def test_youtube_playlist_long(self):
         dl = FakeDownloader()
@@ -97,7 +96,7 @@ class TestYoutubeLists(unittest.TestCase):
         self.assertTrue(len(result['entries']) > 90)
         #test autogenerated channel
         result = ie.extract('https://www.youtube.com/channel/HCtnHdj3df7iM/videos')[0]
-        self.assertTrue(len(result['entries']) > 20)
+        self.assertTrue(len(result['entries']) >= 18)
 
     def test_youtube_user(self):
         dl = FakeDownloader()
@@ -105,5 +104,11 @@ class TestYoutubeLists(unittest.TestCase):
         result = ie.extract('https://www.youtube.com/user/TheLinuxFoundation')[0]
         self.assertTrue(len(result['entries']) >= 320)
 
+    def test_youtube_safe_search(self):
+        dl = FakeDownloader()
+        ie = YoutubePlaylistIE(dl)
+        result = ie.extract('PLtPgu7CB4gbY9oDN3drwC3cMbJggS7dKl')[0]
+        self.assertEqual(len(result['entries']), 2)
+
 if __name__ == '__main__':
     unittest.main()