Merge tag 'upstream/2015.02.28'

[youtubedl] / test / parameters.json

diff --git a/test/parameters.json b/test/parameters.json
index 96998b5c39972bb43faddbb5711d07c9ce31574e..cbff9bd16486fcda2c155e6978c354e320cfc95b 100644 (file)
--- a/test/parameters.json
+++ b/test/parameters.json
@@ -27,9 +27,8 @@
     "rejecttitle": null, 
     "retries": 10, 
     "simulate": false, 
     "rejecttitle": null, 
     "retries": 10, 
     "simulate": false, 

-    "skip_download": false, 

     "subtitleslang": null, 
     "subtitleslang": null, 

-    "subtitlesformat": "srt",
+    "subtitlesformat": "best",

     "test": true, 
     "updatetime": true, 
     "usenetrc": false, 
     "test": true, 
     "updatetime": true, 
     "usenetrc": false, 


@@ -38,7 +37,8 @@
     "writedescription": false, 
     "writeinfojson": true, 
     "writesubtitles": false,
     "writedescription": false, 
     "writeinfojson": true, 
     "writesubtitles": false,

-    "onlysubtitles": false,

     "allsubtitles": false,
     "allsubtitles": false,

-    "listssubtitles": false
+    "listssubtitles": false,
+    "socket_timeout": 20,
+    "fixup": "never"

 }
 }