X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=test%2Ftest_youtube_signature.py;h=5e1ff5eb0ede5bcb020cd027ca00d5b4159f9812;hb=2b35c9ef742bf261078ea10c6c0bba848db1a0df;hp=2c06caef4a2043295dfa1d27596541492ea65ee5;hpb=e0df6211cc9364f62406b2907fa830847324db53;p=youtube-dl

diff --git a/test/test_youtube_signature.py b/test/test_youtube_signature.py
index 2c06caef4..5e1ff5eb0 100644
--- a/test/test_youtube_signature.py
+++ b/test/test_youtube_signature.py
@@ -1,14 +1,18 @@
 #!/usr/bin/env python
 
-import io
-import re
-import string
+# Allow direct execution
+import os
 import sys
 import unittest
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-# Allow direct execution
-import os
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from test.helper import global_setup
+global_setup()
+
+
+import io
+import re
+import string
 
 from youtube_dl.extractor import YoutubeIE
 from youtube_dl.utils import compat_str, compat_urlretrieve
@@ -30,7 +34,7 @@ _TESTS = [
         u'https://s.ytimg.com/yts/swfbin/watch_as3-vflg5GhxU.swf',
         u'swf',
         82,
-        u'23456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!?#$%&\'()*+,-./:;<=>"'
+        u':/.-,+*)=\'&%$#"!ZYX0VUTSRQPONMLKJIHGFEDCBAzyxw>utsrqponmlkjihgfedcba987654321'
     ),
 ]
 
@@ -43,7 +47,7 @@ class TestSignature(unittest.TestCase):
             os.mkdir(self.TESTDATA_DIR)
 
 
-def make_testfunc(url, stype, sig_length, expected_sig):
+def make_tfunc(url, stype, sig_length, expected_sig):
     basename = url.rpartition('/')[2]
     m = re.match(r'.*-([a-zA-Z0-9_-]+)\.[a-z]+$', basename)
     assert m, '%r should follow URL format' % basename
@@ -73,7 +77,7 @@ def make_testfunc(url, stype, sig_length, expected_sig):
     setattr(TestSignature, test_func.__name__, test_func)
 
 for test_spec in _TESTS:
-    make_testfunc(*test_spec)
+    make_tfunc(*test_spec)
 
 
 if __name__ == '__main__':