[Checkins] SVN: zope.security/trunk/ Normalize testcase module-scope imports: test_location.

Tres Seaver cvs-admin at zope.org
Fri Dec 21 01:58:26 UTC 2012


Log message for revision 128823:
  Normalize testcase module-scope imports:  test_location.

Changed:
  _U  zope.security/trunk/
  U   zope.security/trunk/src/zope/security/tests/test_location.py

-=-
Modified: zope.security/trunk/src/zope/security/tests/test_location.py
===================================================================
--- zope.security/trunk/src/zope/security/tests/test_location.py	2012-12-21 01:58:25 UTC (rev 128822)
+++ zope.security/trunk/src/zope/security/tests/test_location.py	2012-12-21 01:58:25 UTC (rev 128823)
@@ -11,12 +11,25 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Context Tests
+"""Test location support
 """
+import unittest
 
-import doctest
 
+def _skip_wo_zope_configuration(testfunc):
+    try:
+        import zope.configuration.xmlconfig
+    except ImportError:
+        from functools import update_wrapper
+        def dummy(self):
+            pass
+        update_wrapper(dummy, testfunc)
+        return dummy
+    else:
+        return testfunc
 
+
+ at _skip_wo_zope_configuration
 def test_locationproxy_security():
     """We start with an unlocated class that will be wrapped by a
        LocationProxy:
@@ -47,4 +60,7 @@
 
 
 def test_suite():
-    return doctest.DocTestSuite()
+    import doctest
+    return unittest.TestSuite((
+        doctest.DocTestSuite(),
+    ))



More information about the checkins mailing list