Merge lp:~thisfred/u1db/bug-1029569 into lp:u1db

[Eric Casteleijn]

handle empty value for doc ids correctly

handle empty value for doc ids correctly

[dobey (dobey)]

review: Approve

=== modified file 'u1db/remote/http_app.py'
--- u1db/remote/http_app.py	2012-10-12 14:51:08 +0000
+++ u1db/remote/http_app.py	2012-10-15 20:19:24 +0000
@@ -49,7 +49,7 @@
 
 
 def parse_list(expression):
-    if expression is None:
+    if not expression:
         return []
     return [t.strip() for t in expression.split(',')]
 
 
=== modified file 'u1db/tests/test_http_app.py'
--- u1db/tests/test_http_app.py	2012-10-12 14:00:15 +0000
+++ u1db/tests/test_http_app.py	2012-10-15 20:19:24 +0000
@@ -286,7 +286,7 @@
                    'CONTENT_TYPE': 'application/json ; charset="utf-8"'}
         invoke = http_app.HTTPInvocationByMethodWithBody(resource, environ,
                                                          parameters)
-        res = invoke()
+        invoke()
         self.assertEqual('{"body": true}', resource.content)
 
     def test_put_sync_stream(self):
@@ -721,6 +721,13 @@
              "has_conflicts": False}]
         self.assertEqual(expected, json.loads(resp.body))
 
+    def test_get_docs_empty_docids(self):
+        resp = self.app.get('/db0/docs?doc_ids=', expect_errors=True)
+        self.assertEqual(400, resp.status)
+        self.assertEqual('application/json', resp.header('content-type'))
+        self.assertEqual(
+            {"error": "missing document ids"}, json.loads(resp.body))
+
     def test_get_docs_missing_doc_ids(self):
         resp = self.app.get('/db0/docs', expect_errors=True)
         self.assertEqual(400, resp.status)
@@ -787,10 +794,12 @@
         self.assertEqual(200, resp.status)
         self.assertEqual(
             'application/json', resp.header('content-type'))
+
         def doc_to_dic(doc):
             return dict(doc_id=doc.doc_id, doc_rev=doc.rev,
                         content=doc.get_json(),
                         has_conflicts=doc.has_conflicts)
+
         expected = sorted([doc_to_dic(doc1), doc_to_dic(doc2)])
         self.assertEqual(expected, sorted(json.loads(resp.body)))
         self.assertEqual(2, int(resp.header('x-u1db-generation')))