Merge remote-tracking branch 'olebowle/gameone'

[youtube-dl] / test / test_swfinterp.py

diff --git a/test/test_swfinterp.py b/test/test_swfinterp.py
index 98a14a006e52595156c322205b10b21f9a1cfcc3..b42cd74c738b70704e1eb9ff9d70fefc89cf6f15 100644 (file)
--- a/test/test_swfinterp.py
+++ b/test/test_swfinterp.py
@@ -7,6 +7,7 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
+import errno
 import io
 import json
 import re
@@ -23,10 +24,10 @@ class TestSWFInterpreter(unittest.TestCase):
     pass
 
 
-for testfile in os.listdir(TEST_DIR):
+def _make_testfunc(testfile):
     m = re.match(r'^(.*)\.(as)$', testfile)
     if not m:
-        continue
+        return
     test_id = m.group(1)
 
     def test_func(self):
@@ -36,7 +37,7 @@ for testfile in os.listdir(TEST_DIR):
                 or os.path.getmtime(swf_file) < os.path.getmtime(as_file)):
             # Recompile
             try:
-                subprocess.check_call(['mxmlc', '--output', swf_file, as_file])
+                subprocess.check_call(['mxmlc', '-output', swf_file, as_file])
             except OSError as ose:
                 if ose.errno == errno.ENOENT:
                     print('mxmlc not found! Skipping test.')
@@ -69,5 +70,8 @@ for testfile in os.listdir(TEST_DIR):
     setattr(TestSWFInterpreter, test_func.__name__, test_func)
 
 
+for testfile in os.listdir(TEST_DIR):
+    _make_testfunc(testfile)
+
 if __name__ == '__main__':
     unittest.main()