[Checkins] SVN: z3c.testsetup/branches/ulif-cleanup/src/z3c/testsetup/__init__.py Remove import of functional specific module. Functional doctests are

Uli Fouquet uli at gnufix.de
Sun Oct 25 14:43:06 EDT 2009


Log message for revision 105267:
  Remove import of functional specific module. Functional doctests are
  now set up in doctesting modules.
  

Changed:
  U   z3c.testsetup/branches/ulif-cleanup/src/z3c/testsetup/__init__.py

-=-
Modified: z3c.testsetup/branches/ulif-cleanup/src/z3c/testsetup/__init__.py
===================================================================
--- z3c.testsetup/branches/ulif-cleanup/src/z3c/testsetup/__init__.py	2009-10-25 13:53:55 UTC (rev 105266)
+++ z3c.testsetup/branches/ulif-cleanup/src/z3c/testsetup/__init__.py	2009-10-25 18:43:06 UTC (rev 105267)
@@ -1,15 +1,15 @@
 from z3c.testsetup.testing import UnitTestSetup
 from z3c.testsetup.util import get_package
+from z3c.testsetup.testgetter import (TestCollector, DocTestCollector,
+                                      PythonTestGetter)
 try:
-    import zope.app.testing
-    from z3c.testsetup.functional.doctesting import FunctionalDocTestSetup
-    from z3c.testsetup.functional.testgetter import (
-        TestCollector, DocTestCollector, PythonTestGetter)
+    # It seems like This must work to make internal functional tests
+    # work(?)
+    import zope.app.testing.functional
+
 except ImportError:
-    # if zope.app.testing is missing we get a reduced set of getters
-    # and collectors, i.e. a set without functional testing machinery.
-    from z3c.testsetup.testgetter import (TestCollector, DocTestCollector,
-                                          PythonTestGetter)
+    # if zope.app.testing is missing, other things should still work.
+    pass
 
 def register_all_tests(pkg_or_dotted_name, *args, **kwargs):
     return TestCollector(pkg_or_dotted_name, *args, **kwargs)



More information about the checkins mailing list