diff options
| author | Philipp Hagemeister <[email protected]> | 2013-12-02 13:36:20 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <[email protected]> | 2013-12-02 13:36:20 +0100 |
| commit | a9be0cc736d63890413ced94ebb0d68a45730c97 (patch) | |
| tree | a4a38938b2a3899159808853aa88a09af317784e /test | |
| parent | e344693b65a42436eb40efe85095c01f767a502d (diff) | |
| parent | 55a10eab48776197245d3d87b86195f182d8d82a (diff) | |
| download | youtube-dl-a9be0cc736d63890413ced94ebb0d68a45730c97.tar.gz youtube-dl-a9be0cc736d63890413ced94ebb0d68a45730c97.zip | |
Merge branch 'master' of github.com:rg3/youtube-dl
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_all_urls.py | 4 | ||||
| -rw-r--r-- | test/test_playlists.py | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/test/test_all_urls.py b/test/test_all_urls.py index 1f1adb6b4..6b9764c67 100644 --- a/test/test_all_urls.py +++ b/test/test_all_urls.py @@ -106,6 +106,10 @@ class TestAllURLsMatching(unittest.TestCase): self.assertMatch(':colbertreport', ['ComedyCentralShows']) self.assertMatch(':cr', ['ComedyCentralShows']) + def test_vimeo_matching(self): + self.assertMatch('http://vimeo.com/channels/tributes', ['vimeo:channel']) + self.assertMatch('http://vimeo.com/user7108434', ['vimeo:user']) + if __name__ == '__main__': unittest.main() diff --git a/test/test_playlists.py b/test/test_playlists.py index 167801ae2..13a6f4b2f 100644 --- a/test/test_playlists.py +++ b/test/test_playlists.py @@ -15,6 +15,7 @@ from youtube_dl.extractor import ( DailymotionPlaylistIE, DailymotionUserIE, VimeoChannelIE, + VimeoUserIE, UstreamChannelIE, SoundcloudSetIE, SoundcloudUserIE, @@ -54,6 +55,14 @@ class TestPlaylists(unittest.TestCase): self.assertEqual(result['title'], u'Vimeo Tributes') self.assertTrue(len(result['entries']) > 24) + def test_vimeo_user(self): + dl = FakeYDL() + ie = VimeoUserIE(dl) + result = ie.extract('http://vimeo.com/nkistudio/videos') + self.assertIsPlaylist(result) + self.assertEqual(result['title'], u'Nki') + self.assertTrue(len(result['entries']) > 65) + def test_ustream_channel(self): dl = FakeYDL() ie = UstreamChannelIE(dl) |