summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2015-02-01 15:21:18 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2015-02-01 15:21:18 +0100
commit4e980275b517b101d5cd3646fee6ced5f627da8a (patch)
tree98ff39cddf7d8d1539f91657f27fa736139030d5
parentc172440ac50b75eaee660a5c00f44c9c8a2f37c0 (diff)
downloadyoutube-dl-4e980275b517b101d5cd3646fee6ced5f627da8a.tar.gz
youtube-dl-4e980275b517b101d5cd3646fee6ced5f627da8a.tar.xz
youtube-dl-4e980275b517b101d5cd3646fee6ced5f627da8a.zip
[test_download] Remove references to "file" in test definitions
-rw-r--r--test/test_download.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test_download.py b/test/test_download.py
index 412f3dbce..6a149ae4f 100644
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -89,7 +89,7 @@ def generator(test_case):
 
         for tc in test_cases:
             info_dict = tc.get('info_dict', {})
-            if not tc.get('file') and not (info_dict.get('id') and info_dict.get('ext')):
+            if not (info_dict.get('id') and info_dict.get('ext')):
                 raise Exception('Test definition incorrect. The output file cannot be known. Are both \'id\' and \'ext\' keys present?')
 
         if 'skip' in test_case:
@@ -116,7 +116,7 @@ def generator(test_case):
         expect_warnings(ydl, test_case.get('expected_warnings', []))
 
         def get_tc_filename(tc):
-            return tc.get('file') or ydl.prepare_filename(tc.get('info_dict', {}))
+            return ydl.prepare_filename(tc.get('info_dict', {}))
 
         res_dict = None