Python 3: the view server tests should deal with bytes.

djc · djc · commit 4ee0ea2f3fd6 · 2014-03-30T19:16:31.000+02:00
diff --git a/couchdb/tests/view.py b/couchdb/tests/view.py
@@ -16,91 +16,91 @@
 class ViewServerTestCase(unittest.TestCase):
 
     def test_reset(self):
-        input = StringIO('["reset"]\n')
+        input = StringIO(b'["reset"]\n')
         output = StringIO()
         view.run(input=input, output=output)
-        self.assertEqual(output.getvalue(), 'true\n')
+        self.assertEqual(output.getvalue(), b'true\n')
 
     def test_add_fun(self):
-        input = StringIO('["add_fun", "def fun(doc): yield None, doc"]\n')
+        input = StringIO(b'["add_fun", "def fun(doc): yield None, doc"]\n')
         output = StringIO()
         view.run(input=input, output=output)
-        self.assertEqual(output.getvalue(), 'true\n')
+        self.assertEqual(output.getvalue(), b'true\n')
 
     def test_map_doc(self):
-        input = StringIO('["add_fun", "def fun(doc): yield None, doc"]\n'
-                         '["map_doc", {"foo": "bar"}]\n')
+        input = StringIO(b'["add_fun", "def fun(doc): yield None, doc"]\n'
+                         b'["map_doc", {"foo": "bar"}]\n')
         output = StringIO()
         view.run(input=input, output=output)
         self.assertEqual(output.getvalue(),
-                         'true\n'
-                         '[[[null, {"foo": "bar"}]]]\n')
+                         b'true\n'
+                         b'[[[null, {"foo": "bar"}]]]\n')
 
     def test_i18n(self):
-        input = StringIO('["add_fun", "def fun(doc): yield doc[\\"test\\"], doc"]\n'
-                         '["map_doc", {"test": "b\xc3\xa5r"}]\n')
+        input = StringIO(b'["add_fun", "def fun(doc): yield doc[\\"test\\"], doc"]\n'
+                         b'["map_doc", {"test": "b\xc3\xa5r"}]\n')
         output = StringIO()
         view.run(input=input, output=output)
         self.assertEqual(output.getvalue(),
-                         'true\n'
-                         '[[["b\xc3\xa5r", {"test": "b\xc3\xa5r"}]]]\n')
+                         b'true\n'
+                         b'[[["b\xc3\xa5r", {"test": "b\xc3\xa5r"}]]]\n')
 
     def test_map_doc_with_logging(self):
-        fun = 'def fun(doc): log(\'running\'); yield None, doc'
-        input = StringIO('["add_fun", "%s"]\n'
-                         '["map_doc", {"foo": "bar"}]\n' % fun)
+        fun = b'def fun(doc): log(\'running\'); yield None, doc'
+        input = StringIO(b'["add_fun", "' + fun + b'"]\n'
+                         b'["map_doc", {"foo": "bar"}]\n')
         output = StringIO()
         view.run(input=input, output=output)
         self.assertEqual(output.getvalue(),
-                         'true\n'
-                         '{"log": "running"}\n'
-                         '[[[null, {"foo": "bar"}]]]\n')
+                         b'true\n'
+                         b'{"log": "running"}\n'
+                         b'[[[null, {"foo": "bar"}]]]\n')
 
     def test_map_doc_with_logging_json(self):
-        fun = 'def fun(doc): log([1, 2, 3]); yield None, doc'
-        input = StringIO('["add_fun", "%s"]\n'
-                         '["map_doc", {"foo": "bar"}]\n' % fun)
+        fun = b'def fun(doc): log([1, 2, 3]); yield None, doc'
+        input = StringIO(b'["add_fun", "' + fun + b'"]\n'
+                         b'["map_doc", {"foo": "bar"}]\n')
         output = StringIO()
         view.run(input=input, output=output)
         self.assertEqual(output.getvalue(),
-                         'true\n'
-                         '{"log": "[1, 2, 3]"}\n'
-                         '[[[null, {"foo": "bar"}]]]\n')
+                         b'true\n'
+                         b'{"log": "[1, 2, 3]"}\n'
+                         b'[[[null, {"foo": "bar"}]]]\n')
 
     def test_reduce(self):
-        input = StringIO('["reduce", '
-                          '["def fun(keys, values): return sum(values)"], '
-                          '[[null, 1], [null, 2], [null, 3]]]\n')
+        input = StringIO(b'["reduce", '
+                          b'["def fun(keys, values): return sum(values)"], '
+                          b'[[null, 1], [null, 2], [null, 3]]]\n')
         output = StringIO()
         view.run(input=input, output=output)
-        self.assertEqual(output.getvalue(), '[true, [6]]\n')
+        self.assertEqual(output.getvalue(), b'[true, [6]]\n')
 
     def test_reduce_with_logging(self):
-        input = StringIO('["reduce", '
-                          '["def fun(keys, values): log(\'Summing %r\' % (values,)); return sum(values)"], '
-                          '[[null, 1], [null, 2], [null, 3]]]\n')
+        input = StringIO(b'["reduce", '
+                          b'["def fun(keys, values): log(\'Summing %r\' % (values,)); return sum(values)"], '
+                          b'[[null, 1], [null, 2], [null, 3]]]\n')
         output = StringIO()
         view.run(input=input, output=output)
         self.assertEqual(output.getvalue(),
-                         '{"log": "Summing (1, 2, 3)"}\n'
-                         '[true, [6]]\n')
+                         b'{"log": "Summing (1, 2, 3)"}\n'
+                         b'[true, [6]]\n')
 
     def test_rereduce(self):
-        input = StringIO('["rereduce", '
-                          '["def fun(keys, values, rereduce): return sum(values)"], '
-                          '[1, 2, 3]]\n')
+        input = StringIO(b'["rereduce", '
+                          b'["def fun(keys, values, rereduce): return sum(values)"], '
+                          b'[1, 2, 3]]\n')
         output = StringIO()
         view.run(input=input, output=output)
-        self.assertEqual(output.getvalue(), '[true, [6]]\n')
+        self.assertEqual(output.getvalue(), b'[true, [6]]\n')
 
     def test_reduce_empty(self):
-        input = StringIO('["reduce", '
-                          '["def fun(keys, values): return sum(values)"], '
-                          '[]]\n')
+        input = StringIO(b'["reduce", '
+                          b'["def fun(keys, values): return sum(values)"], '
+                          b'[]]\n')
         output = StringIO()
         view.run(input=input, output=output)
         self.assertEqual(output.getvalue(),
-                         '[true, [0]]\n')
+                         b'[true, [0]]\n')
 
 
 def suite():
