Merge tag 'upstream/2015.01.16'

[youtubedl] / test / parameters.json

diff --git a/test/parameters.json b/test/parameters.json
index 96998b5c39972bb43faddbb5711d07c9ce31574e..098cd0cd0c4d17ded161fffbcdc327a7bbb30ee3 100644 (file)
--- a/test/parameters.json
+++ b/test/parameters.json
@@ -27,7 +27,6 @@
     "rejecttitle": null, 
     "retries": 10, 
     "simulate": false, 
-    "skip_download": false, 
     "subtitleslang": null, 
     "subtitlesformat": "srt",
     "test": true, 
@@ -38,7 +37,7 @@
     "writedescription": false, 
     "writeinfojson": true, 
     "writesubtitles": false,
-    "onlysubtitles": false,
     "allsubtitles": false,
-    "listssubtitles": false
+    "listssubtitles": false,
+    "socket_timeout": 20
 }