Fix logging response in query server (#321)

geppettodivacin · djc · commit e8eab1f66fdb · 2017-06-02T16:07:38.000+02:00
Documentation can be found at http://docs.couchdb.org/en/2.0.0/query-server/protocol.html * Fix logging tests to have correct format.
diff --git a/couchdb/tests/view.py b/couchdb/tests/view.py
@@ -53,7 +53,7 @@ def test_map_doc_with_logging(self):
         view.run(input=input, output=output)
         self.assertEqual(output.getvalue(),
                          b'true\n'
-                         b'{"log": "running"}\n'
+                         b'["log", "running"]\n'
                          b'[[[null, {"foo": "bar"}]]]\n')
 
     def test_map_doc_with_logging_json(self):
@@ -64,7 +64,7 @@ def test_map_doc_with_logging_json(self):
         view.run(input=input, output=output)
         self.assertEqual(output.getvalue(),
                          b'true\n'
-                         b'{"log": "[1, 2, 3]"}\n'
+                         b'["log", "[1, 2, 3]"]\n'
                          b'[[[null, {"foo": "bar"}]]]\n')
 
     def test_reduce(self):
@@ -82,7 +82,7 @@ def test_reduce_with_logging(self):
         output = StringIO()
         view.run(input=input, output=output)
         self.assertEqual(output.getvalue(),
-                         b'{"log": "Summing (1, 2, 3)"}\n'
+                         b'["log", "Summing (1, 2, 3)"]\n'
                          b'[true, [6]]\n')
 
     def test_rereduce(self):
diff --git a/couchdb/view.py b/couchdb/view.py
@@ -45,7 +45,7 @@ def _writejson(obj):
     def _log(message):
         if not isinstance(message, util.strbase):
             message = json.encode(message)
-        _writejson({'log': message})
+        _writejson(['log', message])
 
     def reset(config=None):
         del functions[:]
@@ -57,15 +57,15 @@ def add_fun(string):
         try:
             util.pyexec(string, {'log': _log}, globals_)
         except Exception as e:
-            return {'error': {
-                'id': 'map_compilation_error',
-                'reason': e.args[0]
-            }}
-        err = {'error': {
-            'id': 'map_compilation_error',
-            'reason': 'string must eval to a function '
+            return ['error',
+                'map_compilation_error',
+                e.args[0]
+            ]
+        err = ['error',
+            'map_compilation_error',
+            'string must eval to a function '
                       '(ex: "def(doc): return 1")'
-        }}
+        ]
         if len(globals_) != 1:
             return err
         function = list(globals_.values())[0]
@@ -95,15 +95,15 @@ def reduce(*cmd, **kwargs):
         except Exception as e:
             log.error('runtime error in reduce function: %s', e,
                       exc_info=True)
-            return {'error': {
-                'id': 'reduce_compilation_error',
-                'reason': e.args[0]
-            }}
-        err = {'error': {
-            'id': 'reduce_compilation_error',
-            'reason': 'string must eval to a function '
+            return ['error',
+                'reduce_compilation_error',
+                e.args[0]
+            ]
+        err = ['error',
+            'reduce_compilation_error',
+            'string must eval to a function '
                       '(ex: "def(keys, values): return 1")'
-        }}
+        ]
         if len(globals_) != 1:
             return err
         function = list(globals_.values())[0]
