[Zodb-checkins] SVN: ZODB/trunk/src/ZODB/tests/test The stdlib doctest.DocTestSuite is broken in such a way that you can't

[Jim Fulton]

Log message for revision 116148:
  The stdlib doctest.DocTestSuite is broken in such a way that you can't
  repeat tests.  Provide an environment variable to use the doctest from
  zope.testing.
  

Changed:
  U   ZODB/trunk/src/ZODB/tests/testBroken.py
  U   ZODB/trunk/src/ZODB/tests/testblob.py

-=-
Modified: ZODB/trunk/src/ZODB/tests/testBroken.py
===================================================================
--- ZODB/trunk/src/ZODB/tests/testBroken.py	2010-09-02 15:57:41 UTC (rev 116147)
+++ ZODB/trunk/src/ZODB/tests/testBroken.py	2010-09-02 15:57:43 UTC (rev 116148)
@@ -18,7 +18,11 @@
 import unittest
 import persistent
 import transaction
-from doctest import DocTestSuite
+import os
+if os.environ.get('USE_ZOPE_TESTING_DOCTEST'):
+    from zope.testing.doctest import DocTestSuite
+else:
+    from doctest import DocTestSuite
 from ZODB.tests.util import DB
 
 def test_integration():

Modified: ZODB/trunk/src/ZODB/tests/testblob.py
===================================================================
--- ZODB/trunk/src/ZODB/tests/testblob.py	2010-09-02 15:57:41 UTC (rev 116147)
+++ ZODB/trunk/src/ZODB/tests/testblob.py	2010-09-02 15:57:43 UTC (rev 116148)
@@ -20,8 +20,13 @@
 from ZODB.FileStorage import FileStorage
 from ZODB.tests.testConfig import ConfigTestBase
 
-import doctest
 import os
+if os.environ.get('USE_ZOPE_TESTING_DOCTEST'):
+    from zope.testing import doctest
+else:
+    import doctest
+
+import os
 import random
 import re
 import struct