Merge lp:~jameinel/u1db/c-sync-to-http into lp:u1db

[John A Meinel]

This adds a couple of integration tests that we were missing.

Namely, that we use a real HTTP (and a real OAuth + HTTP) server and makes sure that the C-level sync code is able to have the two objects talk to each other.

We had code that the C HTTP Sync Target acts like all other sync targets, but not an end-to-end via C test.

It turned out that we needed to play with the gil code a bit, because you have libcurl code waiting for a response, and need to let the python server run. But we've done that elsewhere as well.

The good thing, is that it just worked, and we didn't have to actually change any code.

[Eric Casteleijn (thisfred)]

+1

review: Approve

=== modified file 'u1db/tests/c_backend_wrapper.pyx'
--- u1db/tests/c_backend_wrapper.pyx	2012-04-30 11:19:18 +0000
+++ u1db/tests/c_backend_wrapper.pyx	2012-05-03 14:32:17 +0000
@@ -208,7 +208,7 @@
     int u1db__get_sync_target(u1database *db, u1db_sync_target **sync_target)
     int u1db__free_sync_target(u1db_sync_target **sync_target)
     int u1db__sync_db_to_target(u1database *db, u1db_sync_target *target,
-                                int *local_gen_before_sync)
+                                int *local_gen_before_sync) nogil
 
     int u1db__sync_exchange_insert_doc_from_source(u1db_sync_exchange *se,
             u1db_document *doc, int source_gen)
@@ -1122,12 +1122,13 @@
     """Sync the data between a CDatabase and a CSyncTarget"""
     cdef CDatabase cdb
     cdef CSyncTarget ctarget
-    cdef int local_gen = 0
+    cdef int local_gen = 0, status
 
     cdb = db
     ctarget = target
-    handle_status("sync_db_to_target",
-        u1db__sync_db_to_target(cdb._db, ctarget._st, &local_gen))
+    with nogil:
+        status = u1db__sync_db_to_target(cdb._db, ctarget._st, &local_gen)
+    handle_status("sync_db_to_target", status)
     return local_gen
 
 

=== modified file 'u1db/tests/test_c_backend.py'
--- u1db/tests/test_c_backend.py	2012-04-27 14:22:47 +0000
+++ u1db/tests/test_c_backend.py	2012-05-03 14:32:17 +0000
@@ -19,6 +19,10 @@
     tests,
     )
 from u1db.tests import c_backend_wrapper, c_backend_error
+from u1db.tests.test_remote_sync_target import (
+    http_server_def,
+    oauth_http_server_def,
+    )
 
 
 class TestCDatabaseExists(tests.TestCase):
@@ -295,6 +299,55 @@
         self.assertIn('oauth_signature="', auth)
 
 
+class TestSyncCtoHTTPViaC(tests.TestCaseWithServer):
+
+    server_def = staticmethod(http_server_def)
+
+    def setUp(self):
+        super(TestSyncCtoHTTPViaC, self).setUp()
+        if c_backend_wrapper is None:
+            self.skipTest("The c_backend_wrapper could not be imported")
+        self.startServer()
+
+    def test_trivial_sync(self):
+        mem_db = self.request_state._create_database('test.db')
+        mem_doc = mem_db.create_doc(tests.nested_doc)
+        url = self.getURL('test.db')
+        target = c_backend_wrapper.create_http_sync_target(url)
+        db = c_backend_wrapper.CDatabase(':memory:')
+        doc = db.create_doc(tests.simple_doc)
+        c_backend_wrapper.sync_db_to_target(db, target)
+        self.assertGetDoc(mem_db, doc.doc_id, doc.rev, doc.content, False)
+        self.assertGetDoc(db, mem_doc.doc_id, mem_doc.rev, mem_doc.content,
+                          False)
+
+
+class TestSyncCtoOAuthHTTPViaC(tests.TestCaseWithServer):
+
+    server_def = staticmethod(oauth_http_server_def)
+
+    def setUp(self):
+        super(TestSyncCtoOAuthHTTPViaC, self).setUp()
+        if c_backend_wrapper is None:
+            self.skipTest("The c_backend_wrapper could not be imported")
+        self.startServer()
+
+    def test_trivial_sync(self):
+        mem_db = self.request_state._create_database('test.db')
+        mem_doc = mem_db.create_doc(tests.nested_doc)
+        url = self.getURL('~/test.db')
+        target = c_backend_wrapper.create_oauth_http_sync_target(url,
+                tests.consumer1.key, tests.consumer1.secret,
+                tests.token1.key, tests.token1.secret)
+        db = c_backend_wrapper.CDatabase(':memory:')
+        doc = db.create_doc(tests.simple_doc)
+        c_backend_wrapper.sync_db_to_target(db, target)
+        self.assertGetDoc(mem_db, doc.doc_id, doc.rev, doc.content, False)
+        self.assertGetDoc(db, mem_doc.doc_id, mem_doc.rev, mem_doc.content,
+                          False)
+
+
+
 class TestVectorClock(BackendTests):
 
     def create_vcr(self, rev):