Merge lp:~thisfred/u1db/fix-error-msg into lp:u1db

[Eric Casteleijn]

Fixed the error message in the case a user provides JSON to create_doc, which expects a Python dictionary.

Fixed the error message in the case a user provides JSON to create_doc, which expects a Python dictionary.

[Lucio Torre (lucio.torre)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~thisfred/u1db/fix-error-msg into lp:u1db failed. Below is the output from the failed tests.

/bin/sh: 1: cmake: not found

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~thisfred/u1db/fix-error-msg into lp:u1db failed. Below is the output from the failed tests.

/bin/sh: 1: cmake: not found

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~thisfred/u1db/fix-error-msg into lp:u1db failed. Below is the output from the failed tests.

/bin/sh: 1: cmake: not found

=== modified file 'u1db/backends/__init__.py'
--- u1db/backends/__init__.py	2012-08-14 14:31:45 +0000
+++ u1db/backends/__init__.py	2012-10-06 16:19:20 +0000
@@ -88,6 +88,8 @@
         raise NotImplementedError(self._has_conflicts)
 
     def create_doc(self, content, doc_id=None):
+        if not isinstance(content, dict):
+            raise errors.InvalidContent
         json_string = json.dumps(content)
         if doc_id is None:
             doc_id = self._allocate_doc_id()

=== modified file 'u1db/tests/test_backends.py'
--- u1db/tests/test_backends.py	2012-09-28 12:13:18 +0000
+++ u1db/tests/test_backends.py	2012-10-06 16:19:20 +0000
@@ -1859,6 +1859,9 @@
         doc = self.db.create_doc(self.simple_doc, doc_id='my_doc_id')
         self.assertTrue(isinstance(doc, TestAlternativeDocument))
 
+    def test_create_doc_with_invalid_content(self):
+        self.assertRaises(errors.InvalidContent, self.db.create_doc, "{}")
+
     def test_get_doc_after_put_with_factory(self):
         doc = self.db.create_doc(self.simple_doc, doc_id='my_doc_id')
         self.db.set_document_factory(TestAlternativeDocument)