Merge lp:~vds/desktopcouch/fix_attachment_reconnection into lp:desktopcouch

[Vincenzo Di Somma]

Fixes the problem with the reconnection of both the attachment and the db change.

Despite the name this branch fixes the problem with the reconnection of both the attachment and the db change.

[Chad Miller (cmiller)]

review: Approve

[Manuel de la Peña (mandel)]

+1

review: Approve

=== modified file 'desktopcouch/records/server_base.py'
--- desktopcouch/records/server_base.py	2010-09-30 19:43:12 +0000
+++ desktopcouch/records/server_base.py	2010-10-01 16:41:11 +0000
@@ -48,6 +48,19 @@
 #DEFAULT_DESIGN_DOCUMENT = "design"
 DEFAULT_DESIGN_DOCUMENT = None  # each view in its own eponymous design doc.
 
+
+def get_changes(self, changes_since):
+    """This method is used to monkey patch the database to provide a
+    get_changes method"""
+    # Can't use self._server.resource.get() directly because
+    # it encodes "/".
+    uri = couchdburi(
+        self.resource.uri, "_changes",
+        since=changes_since)
+    resp, data = self.resource.http.request(uri, "GET", "", {})
+    return resp, data
+
+
 class FieldsConflict(Exception):
     """Raised in case of an unrecoverable couchdb conflict."""
 
@@ -191,6 +204,8 @@
                 raise NoSuchDatabase(self._database_name)
         if self.db is None:
             self.db = self._server[self._database_name]
+            if not hasattr(self.db, 'get_changes'):
+                setattr(self.db.__class__, 'get_changes', get_changes)
         else:
             # Monkey-patch the object the user already uses.  Oook!
             new_db = self._server[self._database_name]
@@ -647,14 +662,8 @@
         now = time()
         call_count = 0
         if not niceness or now > self._changes_last_used + niceness:
-
-            # Can't use self._server.resource.get() directly because
-            # it encodes "/".
-            uri = couchdburi(
-                self._server.resource.uri, self.db.name, "_changes",
-                since=self._changes_since)
-            ## Assume server has not crashed and URI is the same.  FIXME
-            resp, data = self._server.resource.http.request(uri, "GET", "", {})
+            resp, data = self.with_reconnects(self.db.get_changes,
+                                              self._changes_since)
             if resp["status"] != '200':
                 raise IOError(
                     "HTTP response code %s.\n%s" % (resp["status"], data))

=== modified file 'desktopcouch/records/tests/test_server.py'
--- desktopcouch/records/tests/test_server.py	2010-09-30 19:43:12 +0000
+++ desktopcouch/records/tests/test_server.py	2010-10-01 16:41:11 +0000
@@ -21,6 +21,7 @@
 import testtools
 import os
 import signal
+import socket
 import time
 
 import desktopcouch.tests as test_environment
@@ -382,7 +383,7 @@
         # Ensure time is same.
         self.assertEqual(saved_time, self.database._changes_last_used)
 
-        ###self.maybe_die()  # should be able to survive couchdb death
+        self.maybe_die()  # should be able to survive couchdb death
 
         # Next time we run, we get the same event again.
         # Consume queued changes.
@@ -446,7 +447,7 @@
         constructed_record.attach(content, "nu/mbe/rs", "text/plain")
         constructed_record.attach("string", "another document", "text/plain")
 
-        ###self.maybe_die()  # should be able to survive couchdb death
+        self.maybe_die()  # should be able to survive couchdb death
         constructed_record.attach("XXXXXXXXX", "never used", "text/plain")
         constructed_record.detach("never used")  # detach works before commit.
 
@@ -459,7 +460,6 @@
         self.assertRaises(KeyError, constructed_record.attach, content,
                 "another document", "text/x-rst")
 
-        ###self.maybe_die()  # should be able to survive couchdb death
         record_id = self.database.put_record(constructed_record)
         retrieved_record = self.database.get_record(record_id)
 
@@ -480,7 +480,7 @@
         # get new
         retrieved_record = self.database.get_record(record_id)
 
-        ###self.maybe_die()  # should be able to survive couchdb death
+        self.maybe_die()  # should be able to survive couchdb death
         # We can get a list of attachments.
         self.assertEqual(set(retrieved_record.list_attachments()),
                 set(["nu/mbe/rs", "Document"]))
@@ -503,7 +503,7 @@
         self.assertEqual(out_data, content.getvalue())
         self.assertEqual(out_content_type, "text/plain")
 
-        ###self.maybe_die()  # should be able to survive couchdb death
+        self.maybe_die()  # should be able to survive couchdb death
         # Asking for a named document that does not exist causes KeyError.
         self.assertRaises(KeyError, retrieved_record.attachment_data,
                 "NoExist")
@@ -605,8 +605,10 @@
             return self.ctx
 
     def maybe_die(self):
-        self.database.ensure_full_commit()
-        time.sleep(2)
+        try:
+            self.database.ensure_full_commit()
+        except socket.error:
+            print "CouchDB already dead..."
         pid = find_pid(start_if_not_running=False, ctx=self.get_test_context())
         if pid is None:
             print "couchdb has already quit!  That's unexpected."
@@ -625,7 +627,9 @@
             return self.ctx
 
     def maybe_die(self):
-        self.database.ensure_full_commit()
-        time.sleep(2)
+        try:
+            self.database.ensure_full_commit()
+        except socket.error:
+            print "CouchDB already dead..."
         stop_couchdb(ctx=self.get_test_context())
         self.wait_until_server_dead()