Merge remote-tracking branch 'jefftimesten/master'

[youtube-dl.git] / test / tests.json

diff --git a/test/tests.json b/test/tests.json
index fddafb22e505fc0922df7052804cbf7d502ba5b7..540c5d1834a0535c0619a667630e0a23aeebdd23 100644 (file)
--- a/test/tests.json
+++ b/test/tests.json
@@ -37,21 +37,21 @@
   },
   {
     "name": "YouPorn",
-    "md5": "fdb230af7a8a52f110b11cdf994877e4",
-    "url": "http://www.youporn.com/watch/633213/me-and-my-french-girl/",
-    "file": "633213.mp4"
+    "md5": "c37ddbaaa39058c76a7e86c6813423c1",
+    "url": "http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/",
+    "file": "505835.mp4"
   },
-    {
+  {
     "name": "Pornotube",
-    "md5": "eb55ce998e9464993933df8d9d196f70",
-    "url": "http://pornotube.com/m/1812947/Intimate-Moments%3A-Masturbation-Sessions",
-    "file": "1812947.flv"
+    "md5": "374dd6dcedd24234453b295209aa69b6",
+    "url": "http://pornotube.com/c/173/m/1689755/Marilyn-Monroe-Bathing",
+    "file": "1689755.flv"
   },
   {
     "name": "YouJizz",
-    "md5": "e07263d29b39c3cd2b997b3d3c73ca2d",
-    "url": "http://www.youjizz.com/videos/daddys-girl--3549881.html",
-    "file": "3549881.flv"
+    "md5": "07e15fa469ba384c7693fd246905547c",
+    "url": "http://www.youjizz.com/videos/zeichentrick-1-2189178.html",
+    "file": "2189178.flv"
   },
   {
     "name": "Vimeo",
@@ -178,5 +178,39 @@
     "params": {
       "skip_download": true
     }
+  },
+  {
+    "name": "ComedyCentral",
+    "url": "http://www.thedailyshow.com/full-episodes/thu-december-13-2012-kristen-stewart",
+    "playlist": [
+      {
+        "file": "422204.mp4",
+        "md5": "7a7abe068b31ff03e7b8a37596e72380",
+        "info_dict": {
+            "title": "thedailyshow-thu-december-13-2012-kristen-stewart part 1"
+        }
+      },
+      {
+        "file": "422205.mp4",
+        "md5": "30552b7274c94dbb933f64600eadddd2",
+        "info_dict": {
+            "title": "thedailyshow-thu-december-13-2012-kristen-stewart part 2"
+        }
+      },
+      {
+        "file": "422206.mp4",
+        "md5": "1f4c0664b352cb8e8fe85d5da4fbee91",
+        "info_dict": {
+            "title": "thedailyshow-thu-december-13-2012-kristen-stewart part 3"
+        }
+      },
+      {
+        "file": "422207.mp4",
+        "md5": "f61ee8a4e6bd1308438e03badad78554",
+        "info_dict": {
+            "title": "thedailyshow-thu-december-13-2012-kristen-stewart part 4"
+        }
+      }
+    ]
   }
 ]