Adapt test_download to support playlists, and remove race conditions

2013-01-01 19:30:29 +01:00 · 2013-01-01 19:30:29 +01:00 · 5c892b0ba9
commit 5c892b0ba9
parent 6985325e01
3 changed files with 54 additions and 29 deletions
--- a/test/tests.json
+++ b/test/tests.json
@ -124,16 +124,28 @@
  {
    "name": "Steam",
    "url": "http://store.steampowered.com/video/105600/",
-    "file": "81300.flv",
-    "md5": "f870007cee7065d7c76b88f0a45ecc07",
-    "info_dict": {
-        "title": "Terraria 1.1 Trailer"
-    }
+    "playlist": [
+      {
+        "file": "81300.flv",
+        "md5": "f870007cee7065d7c76b88f0a45ecc07",
+        "info_dict": {
+            "title": "Terraria 1.1 Trailer"
+        }
+      },
+      {
+        "file": "80859.flv",
+        "md5": "61aaf31a5c5c3041afb58fb83cbb5751",
+        "info_dict": {
+          "title": "Terraria Trailer"
+        }
+      }
+    ]
  },
  {
    "name": "Ustream",
    "url": "http://www.ustream.tv/recorded/20274954",
-    "files": [["20274954.flv", "088f151799e8f572f84eb62f17d73e5c" ]],
+    "file": "20274954.flv",
+    "md5": "088f151799e8f572f84eb62f17d73e5c",
    "info_dict": {
        "title": "Young Americans for Liberty February 7, 2012 2:28 AM"
    }