From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 10 Mar 2014 12:03:52 +0000 (+0100)
Subject: Merge branch 'master' of github.com:rg3/youtube-dl
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=e712d94adfa6fb9c18c6d7317510086e7b69969b;hp=4126826b10b0571633c36535590d1ad7c0fa73dd;p=youtube-dl

Merge branch 'master' of github.com:rg3/youtube-dl
---

diff --git a/test/test_playlists.py b/test/test_playlists.py
index 4785161f2..e74d42264 100644
--- a/test/test_playlists.py
+++ b/test/test_playlists.py
@@ -254,9 +254,9 @@ class TestPlaylists(unittest.TestCase):
     def test_generic_rss_feed(self):
         dl = FakeYDL()
         ie = GenericIE(dl)
-        result = ie.extract('http://www.escapistmagazine.com/rss/videos/list/1.xml')
+        result = ie.extract('http://phihag.de/2014/youtube-dl/rss.xml')
         self.assertIsPlaylist(result)
-        self.assertEqual(result['id'], 'http://www.escapistmagazine.com/rss/videos/list/1.xml')
+        self.assertEqual(result['id'], 'http://phihag.de/2014/youtube-dl/rss.xml')
         self.assertEqual(result['title'], 'Zero Punctuation')
         self.assertTrue(len(result['entries']) > 10)