Merge tag 'upstream/2014.01.17.2'

[youtubedl] / test / parameters.json

diff --git a/test/parameters.json b/test/parameters.json
index c2082df10b6b522411d3c182683a038a9420569e..487a46d56670c1ded91cd71ed35055e54232187b 100644 (file)
--- a/test/parameters.json
+++ b/test/parameters.json
@@ -29,12 +29,16 @@
     "simulate": false, 
     "skip_download": false, 
     "subtitleslang": null, 
     "simulate": false, 
     "skip_download": false, 
     "subtitleslang": null, 

+    "subtitlesformat": "srt",

     "test": true, 
     "updatetime": true, 
     "usenetrc": false, 
     "username": null, 
     "verbose": true, 
     "writedescription": false, 
     "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
+}