Skip to content

Commit

Permalink
Do not run the C extension tests when we do not have the C extensions.
Browse files Browse the repository at this point in the history
  • Loading branch information
Rotonen committed Oct 19, 2017
1 parent c2a27b4 commit 79938a5
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 11 deletions.
19 changes: 10 additions & 9 deletions src/AccessControl/tests/testSecurityManager.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,13 +255,14 @@ def _getTargetClass(self):
from AccessControl.ImplPython import SecurityManager
return SecurityManager

from AccessControl.Implementation import C_EXTENSION
if C_EXTENSION:
class C_SecurityManagerTests(SecurityManagerTestBase,
ISecurityManagerConformance,
unittest.TestCase):
# The C version mixes in the Python version, which is why we
# can test for conformance to ISecurityManager.

class C_SecurityManagerTests(SecurityManagerTestBase,
ISecurityManagerConformance,
unittest.TestCase):
# The C version mixes in the Python version, which is why we
# can test for conformance to ISecurityManager.

def _getTargetClass(self):
from AccessControl.ImplC import SecurityManager
return SecurityManager
def _getTargetClass(self):
from AccessControl.ImplC import SecurityManager
return SecurityManager
8 changes: 6 additions & 2 deletions src/AccessControl/tests/testZopeSecurityPolicy.py
Original file line number Diff line number Diff line change
Expand Up @@ -749,11 +749,15 @@ def loop():


def test_suite():
from AccessControl.Implementation import C_EXTENSION

suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(Python_ZSPTests))
suite.addTest(unittest.makeSuite(C_ZSPTests))
if C_EXTENSION:
suite.addTest(unittest.makeSuite(C_ZSPTests))
suite.addTest(unittest.makeSuite(Python_SMTests))
suite.addTest(unittest.makeSuite(C_SMTests))
if C_EXTENSION:
suite.addTest(unittest.makeSuite(C_SMTests))
suite.addTest(DocTestSuite())
suite.addTest(unittest.makeSuite(GetRolesWithMultiThreadTest))
return suite

0 comments on commit 79938a5

Please sign in to comment.