From 4a76d1dbe50b7ee6743b74d8e6d5f61314abd30e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <c.david86@gmail.com>
Date: Mon, 3 Jun 2013 22:16:55 +0200
Subject: [PATCH 1/3] Add tests for justin.tv and twitch.tv
---
test/test_justin_tv.py | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100755 test/test_justin_tv.py
diff --git a/test/test_justin_tv.py b/test/test_justin_tv.py
new file mode 100755
index 000000000..2cd213404
--- /dev/null
+++ b/test/test_justin_tv.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+
+import sys
+import unittest
+
+# Allow direct execution
+import os
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from youtube_dl.InfoExtractors import JustinTVIE
+
+class TestJustinTVMatching(unittest.TestCase):
+ def test_justin_tv_channelid_matching(self):
+ self.assertTrue(JustinTVIE.suitable(u"justin.tv/vanillatv"))
+ self.assertTrue(JustinTVIE.suitable(u"twitch.tv/vanillatv"))
+ self.assertTrue(JustinTVIE.suitable(u"www.justin.tv/vanillatv"))
+ self.assertTrue(JustinTVIE.suitable(u"www.twitch.tv/vanillatv"))
+ self.assertTrue(JustinTVIE.suitable(u"http://www.justin.tv/vanillatv"))
+ self.assertTrue(JustinTVIE.suitable(u"http://www.twitch.tv/vanillatv"))
+ self.assertTrue(JustinTVIE.suitable(u"http://www.justin.tv/vanillatv/"))
+ self.assertTrue(JustinTVIE.suitable(u"http://www.twitch.tv/vanillatv/"))
+
+ def test_justintv_videoid_matching(self):
+ self.assertTrue(JustinTVIE.suitable(u"http://www.twitch.tv/vanillatv/b/328087483"))
+
+ def test_justin_tv_chapterid_matching(self):
+ self.assertTrue(JustinTVIE.suitable(u"http://www.twitch.tv/tsm_theoddone/c/2349361"))
+
+if __name__ == '__main__':
+ unittest.main()
From 50b4d2598025a672510c4008a80a51cabd9fba5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <c.david86@gmail.com>
Date: Tue, 4 Jun 2013 13:06:49 +0200
Subject: [PATCH 2/3] Merge within test_all_urls
---
test/test_all_urls.py | 16 ++++++++++++++++
test/test_justin_tv.py | 30 ------------------------------
2 files changed, 16 insertions(+), 30 deletions(-)
delete mode 100755 test/test_justin_tv.py
diff --git a/test/test_all_urls.py b/test/test_all_urls.py
index a40360122..a35fba3c9 100644
--- a/test/test_all_urls.py
+++ b/test/test_all_urls.py
@@ -29,6 +29,22 @@ class TestAllURLsMatching(unittest.TestCase):
self.assertTrue(YoutubeChannelIE.suitable('https://www.youtube.com/channel/HCtnHdj3df7iM?feature=gb_ch_rec'))
self.assertTrue(YoutubeChannelIE.suitable('https://www.youtube.com/channel/HCtnHdj3df7iM/videos'))
+ def test_justin_tv_channelid_matching(self):
+ self.assertTrue(JustinTVIE.suitable(u"justin.tv/vanillatv"))
+ self.assertTrue(JustinTVIE.suitable(u"twitch.tv/vanillatv"))
+ self.assertTrue(JustinTVIE.suitable(u"www.justin.tv/vanillatv"))
+ self.assertTrue(JustinTVIE.suitable(u"www.twitch.tv/vanillatv"))
+ self.assertTrue(JustinTVIE.suitable(u"http://www.justin.tv/vanillatv"))
+ self.assertTrue(JustinTVIE.suitable(u"http://www.twitch.tv/vanillatv"))
+ self.assertTrue(JustinTVIE.suitable(u"http://www.justin.tv/vanillatv/"))
+ self.assertTrue(JustinTVIE.suitable(u"http://www.twitch.tv/vanillatv/"))
+
+ def test_justintv_videoid_matching(self):
+ self.assertTrue(JustinTVIE.suitable(u"http://www.twitch.tv/vanillatv/b/328087483"))
+
+ def test_justin_tv_chapterid_matching(self):
+ self.assertTrue(JustinTVIE.suitable(u"http://www.twitch.tv/tsm_theoddone/c/2349361"))
+
def test_youtube_extract(self):
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')
diff --git a/test/test_justin_tv.py b/test/test_justin_tv.py
deleted file mode 100755
index 2cd213404..000000000
--- a/test/test_justin_tv.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import unittest
-
-# Allow direct execution
-import os
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-from youtube_dl.InfoExtractors import JustinTVIE
-
-class TestJustinTVMatching(unittest.TestCase):
- def test_justin_tv_channelid_matching(self):
- self.assertTrue(JustinTVIE.suitable(u"justin.tv/vanillatv"))
- self.assertTrue(JustinTVIE.suitable(u"twitch.tv/vanillatv"))
- self.assertTrue(JustinTVIE.suitable(u"www.justin.tv/vanillatv"))
- self.assertTrue(JustinTVIE.suitable(u"www.twitch.tv/vanillatv"))
- self.assertTrue(JustinTVIE.suitable(u"http://www.justin.tv/vanillatv"))
- self.assertTrue(JustinTVIE.suitable(u"http://www.twitch.tv/vanillatv"))
- self.assertTrue(JustinTVIE.suitable(u"http://www.justin.tv/vanillatv/"))
- self.assertTrue(JustinTVIE.suitable(u"http://www.twitch.tv/vanillatv/"))
-
- def test_justintv_videoid_matching(self):
- self.assertTrue(JustinTVIE.suitable(u"http://www.twitch.tv/vanillatv/b/328087483"))
-
- def test_justin_tv_chapterid_matching(self):
- self.assertTrue(JustinTVIE.suitable(u"http://www.twitch.tv/tsm_theoddone/c/2349361"))
-
-if __name__ == '__main__':
- unittest.main()
From 57bde0d9c7959bd9dadd4a9f3c0b065d5b7978bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <c.david86@gmail.com>
Date: Tue, 4 Jun 2013 13:10:12 +0200
Subject: [PATCH 3/3] Fix the test_all_urls (Import issue)
---
test/test_all_urls.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/test_all_urls.py b/test/test_all_urls.py
index a35fba3c9..dd67286a7 100644
--- a/test/test_all_urls.py
+++ b/test/test_all_urls.py
@@ -7,7 +7,7 @@ import unittest
import os
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from youtube_dl.InfoExtractors import YoutubeIE, YoutubePlaylistIE, YoutubeChannelIE
+from youtube_dl.InfoExtractors import YoutubeIE, YoutubePlaylistIE, YoutubeChannelIE, JustinTVIE
class TestAllURLsMatching(unittest.TestCase):
def test_youtube_playlist_matching(self):