Commit f5487ab2 authored by Vitja Makarov's avatar Vitja Makarov

Handle SkipTest and ReourceDenined case

parent 1bcf08a8
...@@ -655,7 +655,7 @@ class CythonPyregrTestCase(CythonRunTestCase): ...@@ -655,7 +655,7 @@ class CythonPyregrTestCase(CythonRunTestCase):
def _run_doctest(self, result, module): def _run_doctest(self, result, module):
self.run_doctests(module, result) self.run_doctests(module, result)
def patch_support(self, result): def run_tests(self, result):
try: try:
from test import test_support as support from test import test_support as support
except ImportError: # Py3k except ImportError: # Py3k
...@@ -669,11 +669,12 @@ class CythonPyregrTestCase(CythonRunTestCase): ...@@ -669,11 +669,12 @@ class CythonPyregrTestCase(CythonRunTestCase):
support.run_unittest = run_unittest support.run_unittest = run_unittest
support.run_doctest = run_doctest support.run_doctest = run_doctest
def run_tests(self, result): try:
self.patch_support(result)
module = __import__(self.module) module = __import__(self.module)
if hasattr(module, 'test_main'): if hasattr(module, 'test_main'):
module.test_main() module.test_main()
except (unittest.SkipTest, support.ResourceDenied), e:
result.addSkip(self, str(e))
try: try:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment