Merge tag 'upstream/2015.02.06'

[youtubedl] / test / parameters.json

diff --git a/test/parameters.json b/test/parameters.json
index c2082df10b6b522411d3c182683a038a9420569e..098cd0cd0c4d17ded161fffbcdc327a7bbb30ee3 100644 (file)
--- a/test/parameters.json
+++ b/test/parameters.json
@@ -27,14 +27,17 @@
     "rejecttitle": null, 
     "retries": 10, 
     "simulate": false, 
-    "skip_download": false, 
     "subtitleslang": null, 
+    "subtitlesformat": "srt",
     "test": true, 
     "updatetime": true, 
     "usenetrc": false, 
     "username": null, 
     "verbose": true, 
     "writedescription": false, 
-    "writeinfojson": false, 
-    "writesubtitles": false
-}
\ No newline at end of file
+    "writeinfojson": true, 
+    "writesubtitles": false,
+    "allsubtitles": false,
+    "listssubtitles": false,
+    "socket_timeout": 20
+}