diff options
| author | Pierre Rudloff <pierre@rudloff.pro> | 2013-08-22 12:52:05 +0200 |
|---|---|---|
| committer | Pierre Rudloff <pierre@rudloff.pro> | 2013-08-22 12:52:05 +0200 |
| commit | 8d212e604a86da3c924ab15fe8045ab748a8183d (patch) | |
| tree | 5bc5588e5bbe7f8dad3fb1d0bbba354f2fb9e90c /test | |
| parent | 943f7f7a399c6fb3006eb2bd68070f28a272171f (diff) | |
| parent | 063fcc9676718fc4395b92d6e9665e7f3e9c8156 (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
youtube_dl/extractor/jeuxvideo.py
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_all_urls.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/test_all_urls.py b/test/test_all_urls.py index c73d0e467..c54faa380 100644 --- a/test/test_all_urls.py +++ b/test/test_all_urls.py @@ -50,6 +50,7 @@ class TestAllURLsMatching(unittest.TestCase): self.assertEqual(YoutubeIE()._extract_id('http://www.youtube.com/watch?&v=BaW_jenozKc'), 'BaW_jenozKc') self.assertEqual(YoutubeIE()._extract_id('https://www.youtube.com/watch?&v=BaW_jenozKc'), 'BaW_jenozKc') self.assertEqual(YoutubeIE()._extract_id('https://www.youtube.com/watch?feature=player_embedded&v=BaW_jenozKc'), 'BaW_jenozKc') + self.assertEqual(YoutubeIE()._extract_id('https://www.youtube.com/watch_popup?v=BaW_jenozKc'), 'BaW_jenozKc') def test_no_duplicates(self): ies = gen_extractors() |