Merge tag 'upstream/2015.06.04.1'

[youtubedl] / test / parameters.json

diff --git a/test/parameters.json b/test/parameters.json
index 96998b5c39972bb43faddbb5711d07c9ce31574e..7bf59c25fdf77dd4c736f21b9ede9304e9bb214c 100644 (file)
--- a/test/parameters.json
+++ b/test/parameters.json
@@ -7,8 +7,7 @@
     "forcethumbnail": false, 
     "forcetitle": false, 
     "forceurl": false, 
-    "format": null, 
-    "format_limit": null, 
+    "format": "best",
     "ignoreerrors": false, 
     "listformats": null, 
     "logtostderr": false, 
@@ -27,9 +26,8 @@
     "rejecttitle": null, 
     "retries": 10, 
     "simulate": false, 
-    "skip_download": false, 
     "subtitleslang": null, 
-    "subtitlesformat": "srt",
+    "subtitlesformat": "best",
     "test": true, 
     "updatetime": true, 
     "usenetrc": false, 
@@ -38,7 +36,8 @@
     "writedescription": false, 
     "writeinfojson": true, 
     "writesubtitles": false,
-    "onlysubtitles": false,
     "allsubtitles": false,
-    "listssubtitles": false
+    "listssubtitles": false,
+    "socket_timeout": 20,
+    "fixup": "never"
 }