Merge tag 'upstream/2014.02.17'

[youtubedl] / test / test_write_info_json.py

diff --git a/test/test_write_info_json.py b/test/test_write_info_json.py
index a5b6f6972df48f6b7cdcfebc3ea32d11c6a27afa..90426a559551571a7769c6137a76270a4ad47b1c 100644 (file)
--- a/test/test_write_info_json.py
+++ b/test/test_write_info_json.py
@@ -7,8 +7,7 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 

-from test.helper import get_params, global_setup
-global_setup()
+from test.helper import get_params

 
 
 import io
 
 
 import io


@@ -31,9 +30,10 @@ params = get_params({
 
 
 TEST_ID = 'BaW_jenozKc'
 
 
 TEST_ID = 'BaW_jenozKc'

-INFO_JSON_FILE = TEST_ID + '.mp4.info.json'
+INFO_JSON_FILE = TEST_ID + '.info.json'

 DESCRIPTION_FILE = TEST_ID + '.mp4.description'
 EXPECTED_DESCRIPTION = u'''test chars:  "'/\ä↭𝕐
 DESCRIPTION_FILE = TEST_ID + '.mp4.description'
 EXPECTED_DESCRIPTION = u'''test chars:  "'/\ä↭𝕐

+test URL: https://github.com/rg3/youtube-dl/issues/1892

 
 This is a test video for youtube-dl.
 
 
 This is a test video for youtube-dl.