From: Philipp Hagemeister Date: Tue, 26 Feb 2013 19:03:19 +0000 (+0100) Subject: Do not user upper-case for non-constants X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=679790eee1e2c90e36e6a722e4c59c8a25c72934;p=youtube-dl Do not user upper-case for non-constants --- diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py index 7055d5a7a..bf0a9b34e 100644 --- a/test/test_youtube_lists.py +++ b/test/test_youtube_lists.py @@ -35,56 +35,56 @@ class FakeDownloader(object): class TestYoutubeLists(unittest.TestCase): def test_youtube_playlist(self): - DL = FakeDownloader() - IE = YoutubePlaylistIE(DL) - IE.extract('https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re') - self.assertEqual(map(lambda x: YoutubeIE()._extract_id(x[0]), DL.result), + dl = FakeDownloader() + ie = YoutubePlaylistIE(dl) + ie.extract('https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re') + self.assertEqual(map(lambda x: YoutubeIE()._extract_id(x[0]), dl.result), [ 'bV9L5Ht9LgY', 'FXxLjLQi3Fg', 'tU3Bgo5qJZE' ]) #661 - DL = FakeDownloader() - IE = YoutubePlaylistIE(DL) - IE.extract('PLMCmkNmxw6Z9eduM7BZjSEh7HiU543Ig0') - self.assertTrue(len(DL.result) > 20) + dl = FakeDownloader() + ie = YoutubePlaylistIE(dl) + ie.extract('PLMCmkNmxw6Z9eduM7BZjSEh7HiU543Ig0') + self.assertTrue(len(dl.result) > 20) #673 - DL = FakeDownloader() - IE = YoutubePlaylistIE(DL) - IE.extract('PLBB231211A4F62143') - self.assertTrue(len(DL.result) > 40) + dl = FakeDownloader() + ie = YoutubePlaylistIE(dl) + ie.extract('PLBB231211A4F62143') + self.assertTrue(len(dl.result) > 40) def test_youtube_playlist_long(self): - DL = FakeDownloader() - IE = YoutubePlaylistIE(DL) - IE.extract('https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q') - self.assertTrue(len(DL.result) >= 799) + dl = FakeDownloader() + ie = YoutubePlaylistIE(dl) + ie.extract('https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q') + self.assertTrue(len(dl.result) >= 799) def test_youtube_playlist_with_deleted(self): #651 - DL = FakeDownloader() - IE = YoutubePlaylistIE(DL) - IE.extract('https://www.youtube.com/playlist?list=PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC') - self.assertFalse('pElCt5oNDuI' in map(lambda x: YoutubeIE()._extract_id(x[0]), DL.result)) - self.assertFalse('KdPEApIVdWM' in map(lambda x: YoutubeIE()._extract_id(x[0]), DL.result)) + dl = FakeDownloader() + ie = YoutubePlaylistIE(dl) + ie.extract('https://www.youtube.com/playlist?list=PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC') + self.assertFalse('pElCt5oNDuI' in map(lambda x: YoutubeIE()._extract_id(x[0]), dl.result)) + self.assertFalse('KdPEApIVdWM' in map(lambda x: YoutubeIE()._extract_id(x[0]), dl.result)) def test_youtube_course(self): - DL = FakeDownloader() - IE = YoutubePlaylistIE(DL) + dl = FakeDownloader() + ie = YoutubePlaylistIE(dl) # TODO find a > 100 (paginating?) videos course - IE.extract('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8') - self.assertEqual(YoutubeIE()._extract_id(DL.result[0][0]), 'j9WZyLZCBzs') - self.assertEqual(len(DL.result), 25) - self.assertEqual(YoutubeIE()._extract_id(DL.result[-1][0]), 'rYefUsYuEp0') + ie.extract('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8') + self.assertEqual(YoutubeIE()._extract_id(dl.result[0][0]), 'j9WZyLZCBzs') + self.assertEqual(len(dl.result), 25) + self.assertEqual(YoutubeIE()._extract_id(dl.result[-1][0]), 'rYefUsYuEp0') def test_youtube_channel(self): # 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 = YoutubeUserIE(DL) - IE.extract('https://www.youtube.com/user/TheLinuxFoundation') - self.assertTrue(len(DL.result) >= 320) + dl = FakeDownloader() + ie = YoutubeUserIE(dl) + ie.extract('https://www.youtube.com/user/TheLinuxFoundation') + self.assertTrue(len(dl.result) >= 320) if __name__ == '__main__': unittest.main()