Fix doctests with unicode literals on Python 3

djc · djc · commit e3bb37eba849 · 2014-07-05T20:26:37.000+02:00
Provide an adaptive doctests OutputChecker that replaces unicode literals with
simple strings and replaces an exception name with its qualified name.
diff --git a/couchdb/tests/client.py b/couchdb/tests/client.py
@@ -7,7 +7,6 @@
 # you should have received as part of this distribution.
 
 from datetime import datetime
-import doctest
 import os
 import os.path
 import shutil
@@ -789,7 +788,6 @@ def test_startkey(self):
     def test_nullkeys(self):
         self.assertEqual(len(list(self.db.iterview('test/nulls', 10))), self.num_docs)
 
-
 def suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(ServerTestCase, 'test'))
@@ -798,7 +796,7 @@ def suite():
     suite.addTest(unittest.makeSuite(ShowListTestCase, 'test'))
     suite.addTest(unittest.makeSuite(UpdateHandlerTestCase, 'test'))
     suite.addTest(unittest.makeSuite(ViewIterationTestCase, 'test'))
-    suite.addTest(doctest.DocTestSuite(client))
+    suite.addTest(testutil.doctest_suite(client))
     return suite
 
 
diff --git a/couchdb/tests/couchhttp.py b/couchdb/tests/couchhttp.py
@@ -6,7 +6,6 @@
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution.
 
-import doctest
 import socket
 import time
 import unittest
@@ -79,7 +78,7 @@ def test_remove_miss(self):
 
 def suite():
     suite = unittest.TestSuite()
-    suite.addTest(doctest.DocTestSuite(http))
+    suite.addTest(testutil.doctest_suite(http))
     suite.addTest(unittest.makeSuite(SessionTestCase, 'test'))
     suite.addTest(unittest.makeSuite(ResponseBodyTestCase, 'test'))
     suite.addTest(unittest.makeSuite(CacheTestCase, 'test'))
diff --git a/couchdb/tests/design.py b/couchdb/tests/design.py
@@ -6,7 +6,6 @@
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution.
 
-import doctest
 import unittest
 
 from couchdb import design
@@ -52,7 +51,7 @@ def test_sync_many(self):
 def suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DesignTestCase))
-    suite.addTest(doctest.DocTestSuite(design))
+    suite.addTest(testutil.doctest_suite(design))
     return suite
 
 
diff --git a/couchdb/tests/mapping.py b/couchdb/tests/mapping.py
@@ -7,7 +7,6 @@
 # you should have received as part of this distribution.
 
 from decimal import Decimal
-import doctest
 import unittest
 
 from couchdb import design, mapping
@@ -253,7 +252,7 @@ def test_query(self):
 
 def suite():
     suite = unittest.TestSuite()
-    suite.addTest(doctest.DocTestSuite(mapping))
+    suite.addTest(testutil.doctest_suite(mapping))
     suite.addTest(unittest.makeSuite(DocumentTestCase, 'test'))
     suite.addTest(unittest.makeSuite(ListFieldTestCase, 'test'))
     suite.addTest(unittest.makeSuite(WrappingTestCase, 'test'))
diff --git a/couchdb/tests/multipart.py b/couchdb/tests/multipart.py
@@ -6,11 +6,11 @@
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution.
 
-import doctest
 import unittest
 
 from couchdb import multipart
 from couchdb.util import StringIO
+from couchdb.tests import testutil
 
 class ReadMultipartTestCase(unittest.TestCase):
 
@@ -211,7 +211,7 @@ def test_unicode_headers(self):
 
 def suite():
     suite = unittest.TestSuite()
-    suite.addTest(doctest.DocTestSuite(multipart))
+    suite.addTest(testutil.doctest_suite(multipart))
     suite.addTest(unittest.makeSuite(ReadMultipartTestCase, 'test'))
     suite.addTest(unittest.makeSuite(WriteMultipartTestCase, 'test'))
     return suite
diff --git a/couchdb/tests/testutil.py b/couchdb/tests/testutil.py
@@ -6,10 +6,25 @@
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution.
 
+import doctest
 import random
+import re
 import sys
+
 from couchdb import client
 
+class Py23DocChecker(doctest.OutputChecker):
+    def check_output(self, want, got, optionflags):
+        if sys.version_info[0] > 2:
+            want = re.sub("u'(.*?)'", "'\\1'", want)
+            want = re.sub('u"(.*?)"', '"\\1"', want)
+            want = want.replace('ResourceConflict:',
+                                'couchdb.http.ResourceConflict:')
+        return doctest.OutputChecker.check_output(self, want, got, optionflags)
+
+def doctest_suite(mod):
+    return doctest.DocTestSuite(mod, checker=Py23DocChecker())
+
 class TempDatabaseMixin(object):
 
     temp_dbs = None
diff --git a/couchdb/tests/view.py b/couchdb/tests/view.py
@@ -6,11 +6,11 @@
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution.
 
-import doctest
 import unittest
 
 from couchdb.util import StringIO
 from couchdb import view
+from couchdb.tests import testutil
 
 
 class ViewServerTestCase(unittest.TestCase):
@@ -105,7 +105,7 @@ def test_reduce_empty(self):
 
 def suite():
     suite = unittest.TestSuite()
-    suite.addTest(doctest.DocTestSuite(view))
+    suite.addTest(testutil.doctest_suite(view))
     suite.addTest(unittest.makeSuite(ViewServerTestCase, 'test'))
     return suite
 
