From: Robert Bradshaw <robertwb@math.washington.edu>
Date: Fri, 14 Jan 2011 07:54:47 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/markflorisson88/cython into markflorisson... 
X-Git-Tag: 0.14.1rc0~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c5e16a3f5c5964b2e79cc9bc998a33197afed05a;p=cython.git

Merge branch 'master' of https://github.com/markflorisson88/cython into markflorisson88-master
---

c5e16a3f5c5964b2e79cc9bc998a33197afed05a
diff --cc runtests.py
index 004b0493,2376a295..92252f16
--- a/runtests.py
+++ b/runtests.py
@@@ -630,57 -625,31 +630,57 @@@ class CythonUnitTestCase(CythonRunTestC
      def shortDescription(self):
          return "compiling (%s) tests in %s" % (self.language, self.module)
  
 -    def run(self, result=None):
 -        if result is None:
 -            result = self.defaultTestResult()
 -        result.startTest(self)
 +    def run_tests(self, result):
 +        unittest.defaultTestLoader.loadTestsFromName(self.module).run(result)
 +
 +
 +class CythonPyregrTestCase(CythonRunTestCase):
 +    def _run_unittest(self, result, *classes):
 +        """Run tests from unittest.TestCase-derived classes."""
 +        valid_types = (unittest.TestSuite, unittest.TestCase)
 +        suite = unittest.TestSuite()
 +        for cls in classes:
 +            if isinstance(cls, str):
 +                if cls in sys.modules:
 +                    suite.addTest(unittest.findTestCases(sys.modules[cls]))
 +                else:
 +                    raise ValueError("str arguments must be keys in sys.modules")
 +            elif isinstance(cls, valid_types):
 +                suite.addTest(cls)
 +            else:
 +                suite.addTest(unittest.makeSuite(cls))
 +        suite.run(result)
 +
 +    def _run_doctest(self, result, module):
 +        self.run_doctests(module, result)
 +
 +    def run_tests(self, result):
          try:
 -            self.setUp()
 -            try:
 -                self.runCompileTest()
 -                unittest.defaultTestLoader.loadTestsFromName(self.module).run(result)
 -            finally:
 -                check_thread_termination()
 -        except Exception:
 -            result.addError(self, sys.exc_info())
 -            result.stopTest(self)
 +            from test import test_support as support
 +        except ImportError: # Py3k
 +            from test import support
 +
 +        def run_unittest(*classes):
 +            return self._run_unittest(result, *classes)
 +        def run_doctest(module, verbosity=None):
 +            return self._run_doctest(result, module)
 +
 +        support.run_unittest = run_unittest
 +        support.run_doctest = run_doctest
 +
          try:
 -            self.tearDown()
 -        except Exception:
 -            pass
 +            module = __import__(self.module)
 +            if hasattr(module, 'test_main'):
 +                module.test_main()
 +        except (unittest.SkipTest, support.ResourceDenied):
 +            result.addSkip(self, 'ok')
  
- 
- try:
-     import gdb
-     include_debugger = sys.version_info[:2] > (2, 5)
- except:
-     include_debugger = False
+ # Someone wrapped this in a:
+ # 'try: import gdb; ... except: include_debugger = False' thing, but don't do 
+ # this, it doesn't work as gdb is a builtin module in GDB. The tests themselves
+ # are doing the skipping. If there's a problem with the tests, please file an 
+ # issue.
+ include_debugger = sys.version_info[:2] > (2, 5)
  
  def collect_unittests(path, module_prefix, suite, selectors):
      def file_matches(filename):