Merge lp:~thisfred/u1db/quota-error-handling into lp:u1db

[Eric Casteleijn]

added quota error client tests for quota and document too big

added quota error client tests for quota and document too big

[John O'Brien (jdobrien)]

This looks good to me.

review: Approve

=== modified file 'include/u1db/u1db.h'
--- include/u1db/u1db.h	2012-07-09 17:43:47 +0000
+++ include/u1db/u1db.h	2012-07-11 17:26:19 +0000
@@ -75,6 +75,7 @@
 #define U1DB_INVALID_GENERATION -21
 #define U1DB_TARGET_UNAVAILABLE -22
 #define U1DB_DOCUMENT_TOO_BIG -23
+#define U1DB_USER_QUOTA_EXCEEDED -24
 #define U1DB_INTERNAL_ERROR -999
 
 // Used by put_doc_if_newer
 
=== modified file 'u1db/errors.py'
--- u1db/errors.py	2012-07-09 17:43:47 +0000
+++ u1db/errors.py	2012-07-11 17:26:19 +0000
@@ -49,6 +49,12 @@
     wire_description = "document too big"
 
 
+class UserQuotaExceeded(U1DBError):
+    """Document exceeds the maximum document size for this database."""
+
+    wire_description = "user quota exceeded"
+
+
 class InvalidTransactionId(U1DBError):
     """Invalid transaction for generation."""
 
 
=== modified file 'u1db/remote/http_errors.py'
--- u1db/remote/http_errors.py	2012-07-09 21:00:06 +0000
+++ u1db/remote/http_errors.py	2012-07-11 17:26:19 +0000
@@ -26,6 +26,7 @@
     (errors.InvalidDocId.wire_description, 400),
     (errors.Unauthorized.wire_description, 401),
     (errors.DocumentTooBig.wire_description, 403),
+    (errors.UserQuotaExceeded.wire_description, 403),
     (errors.DatabaseDoesNotExist.wire_description, 404),
     (errors.DocumentDoesNotExist.wire_description, 404),
     (errors.DocumentAlreadyDeleted.wire_description, 404),
 
=== modified file 'u1db/tests/c_backend_wrapper.pyx'
--- u1db/tests/c_backend_wrapper.pyx	2012-07-10 17:55:45 +0000
+++ u1db/tests/c_backend_wrapper.pyx	2012-07-11 17:26:19 +0000
@@ -130,6 +130,7 @@
     int U1DB_NOT_IMPLEMENTED
     int U1DB_INVALID_JSON
     int U1DB_DOCUMENT_TOO_BIG
+    int U1DB_USER_QUOTA_EXCEEDED
     int U1DB_INVALID_VALUE_FOR_INDEX
     int U1DB_INVALID_GLOBBING
     int U1DB_BROKEN_SYNC_STREAM
@@ -608,6 +609,8 @@
         raise errors.InvalidJSON
     if status == U1DB_DOCUMENT_TOO_BIG:
         raise errors.DocumentTooBig
+    if status == U1DB_USER_QUOTA_EXCEEDED:
+        raise errors.UserQuotaExceeded
     raise RuntimeError('%s (status: %s)' % (context, status))
 
 
 
=== modified file 'u1db/tests/test_http_client.py'
--- u1db/tests/test_http_client.py	2012-06-25 14:25:49 +0000
+++ u1db/tests/test_http_client.py	2012-07-11 17:26:19 +0000
@@ -275,6 +275,20 @@
         self.assertTrue("content-type" in e.headers)
         self.assertEqual(5, self.errors)
 
+    def test_document_too_big(self):
+        cli = self.getClient()
+        self.assertRaises(errors.DocumentTooBig,
+                          cli._request_json, 'POST', ['error'], {},
+                          {'status': "403 Forbidden",
+                           'response': {"error": "document too big"}})
+
+    def test_user_quota_exceeded(self):
+        cli = self.getClient()
+        self.assertRaises(errors.UserQuotaExceeded,
+                          cli._request_json, 'POST', ['error'], {},
+                          {'status': "403 Forbidden",
+                           'response': {"error": "user quota exceeded"}})
+
     def test_generic_u1db_error(self):
         cli = self.getClient()
         self.assertRaises(errors.U1DBError,