Allow bypassing expected failures

README.md

@@ -38,5 +38,8 @@ Any pygame-cffi discussion welcome!
 ## Running Tests
 
 * Upstream pygame unit tests: `python -m test`
+ * Tests that are known to fail on pygame_cffi are marked as expected
+   failures. To see these failures, pass the `--expected-failures`
+   argument.
 * Conformance between pygame and pygame_cffi: See `conformance/README`
 * pygame_cffi functionality example apps are in the `demos` directory

test/__main__.py

@@ -98,6 +98,8 @@
 kwds = {}
 if options.incomplete:
     kwds['incomplete'] = True
+if options.expected_failures:
+    kwds['expected_failures'] = True
 if options.nosubprocess:
     kwds['nosubprocess'] = True
 if options.dump:

test/test_utils/__init__.py

@@ -219,9 +219,14 @@ def test():
 ################################################################################
 # pygame_cffi additions:
 
+fail_expected_failures = 0
+
+
 def expected_failure(func):
     @wraps(func)
     def wrapper(*args, **kwargs):
+        if fail_expected_failures:
+            return func(*args, **kwargs)
         try:
             return func(*args, **kwargs)
         except AssertionError:
@@ -234,6 +239,8 @@ def expected_error(exception):
     def decorate(func):
         @wraps(func)
         def wrapper(*args, **kwargs):
+            if fail_expected_failures:
+                return func(*args, **kwargs)
             try:
                 return func(*args, **kwargs)
             except exception:

test/test_utils/run_tests.py

@@ -243,6 +243,7 @@ def run(*args, **kwds):
                 pass_on_args.append('--%s' % option)
                 pass_on_args.append(str(value))
         for option, value in options.items():
+            option = option.replace('_', '-')
             if value:
                 pass_on_args.append('--%s' % option)
 

test/test_utils/test_runner.py

@@ -71,6 +71,11 @@ def exclude_callback(option, opt, value, parser):
      "-i",  "--incomplete", action = 'store_true',
      help   = "fail incomplete tests" )
 
+opt_parser.add_option (
+     "-E",  "--expected-failures", action = 'store_true',
+     help   = "fail tests that are marked as expected failures "
+               "(incomplete implementations in pygame_cffi)" )
+
 opt_parser.add_option (
      "-n",  "--nosubprocess", action = "store_true",
      help   = "run everything in a single process "
@@ -258,10 +263,12 @@ def run_test(module, **kwds):
     """
 
     option_incomplete = kwds.get('incomplete', False)
+    option_expected_failures = kwds.get('expected_failures', False)
     option_nosubprocess = kwds.get('nosubprocess', False)
 
     suite = unittest.TestSuite()
     test_utils.fail_incomplete_tests = option_incomplete
+    test_utils.fail_expected_failures = option_expected_failures
 
     m = import_submodule(module)
     if m.unittest is not unittest:
@@ -315,6 +322,7 @@ def run_test(module, **kwds):
         sys.exit('No test module provided; consider using %s instead' % run_from)
     run_test(args[0],
              incomplete=options.incomplete,
+             expected_failures=options.expected_failures,
              nosubprocess=options.nosubprocess)
 
 ################################################################################