[test_download] Remove references to "file" in test definitions
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 1 Feb 2015 14:21:18 +0000 (15:21 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 1 Feb 2015 14:21:18 +0000 (15:21 +0100)
test/test_download.py

index 412f3dbce8683766ba53061fb2aecee95339b829..6a149ae4f707e1dc048890b72a4903ccb8a5f785 100644 (file)
@@ -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