summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-08-24 07:05:49 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-08-24 07:05:49 +0200
commit28028629b90053cab58e73c692195256155806c5 (patch)
tree33328b2ee689c4f4adb2bcf205dcf9b242aa085f
parent11f75cac3db14681b306633a496e9aaae2cfc0a7 (diff)
downloadyoutube-dl-28028629b90053cab58e73c692195256155806c5.tar.gz
youtube-dl-28028629b90053cab58e73c692195256155806c5.tar.xz
youtube-dl-28028629b90053cab58e73c692195256155806c5.zip
[gameone:playlist] Move test to extractor
-rw-r--r--test/test_playlists.py7
-rw-r--r--youtube_dl/extractor/gameone.py13
2 files changed, 12 insertions, 8 deletions
diff --git a/test/test_playlists.py b/test/test_playlists.py
index 0691ff110..3f79a7d6a 100644
--- a/test/test_playlists.py
+++ b/test/test_playlists.py
@@ -408,13 +408,6 @@ class TestPlaylists(unittest.TestCase):
         self.assertEqual(result['id'], 'rbhagwati2')
         assertGreaterEqual(self, len(result['entries']), 179)
 
-    def test_GameOne_playlist(self):
-        dl = FakeYDL()
-        ie = GameOnePlaylistIE(dl)
-        result = ie.extract('http://www.gameone.de/tv')
-        self.assertIsPlaylist(result)
-        self.assertEqual(result['title'], 'GameOne')
-        assertGreaterEqual(self, len(result['entries']), 294)
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/youtube_dl/extractor/gameone.py b/youtube_dl/extractor/gameone.py
index 12f757329..3022f539d 100644
--- a/youtube_dl/extractor/gameone.py
+++ b/youtube_dl/extractor/gameone.py
@@ -89,13 +89,24 @@ class GameOneIE(InfoExtractor):
             'timestamp': timestamp,
         }
 
+
 class GameOnePlaylistIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?gameone\.de(?:/tv)?/?$'
+    IE_NAME = 'gameone:playlist'
+    _TEST = {
+        'url': 'http://www.gameone.de/tv',
+        'info_dict': {
+            'title': 'GameOne',
+        },
+        'playlist_mincount': 294,
+    }
 
     def _real_extract(self, url):
         webpage = self._download_webpage('http://www.gameone.de/tv', 'TV')
         max_id = max(map(int, re.findall(r'<a href="/tv/(\d+)"', webpage)))
-        entries = [self.url_result('http://www.gameone.de/tv/%d' % video_id, 'GameOne') for video_id in range(max_id, 0, -1)]
+        entries = [
+            self.url_result('http://www.gameone.de/tv/%d' % video_id, 'GameOne')
+            for video_id in range(max_id, 0, -1)]
 
         return {
             '_type': 'playlist',