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

[Vincenzo Di Somma]

Fixes a problem with delete files and reconnection.

Fixes a problem with delete files and reconnection.

[Eric Casteleijn (thisfred)]

Looks good, tests pass

review: Approve

[Vincenzo Di Somma (vds)]

Three unrelated errors in tests. Looks very good!

===============================================================================
[ERROR]: canonical.tests.test_share_sync.TestShareClientMove.test_syncs_get_changed_file_hash

Traceback (most recent call last):
Failure: ubuntuone.u1sync.main.TreesDiffer:
===============================================================================
[ERROR]: canonical.tests.test_sync.TestClientMove.test_syncs_get_changed_file_hash

Traceback (most recent call last):
Failure: ubuntuone.u1sync.main.TreesDiffer:
===============================================================================
[ERROR]: canonical.tests.test_udf_sync.TestUDFClientMove.test_syncs_get_changed_file_hash

Traceback (most recent call last):
Failure: ubuntuone.u1sync.main.TreesDiffer:

review: Approve

[Manuel de la Peña (mandel)]

+1 Ran all the tests, no issues. Code looks good to me.

review: Approve

[Vincenzo Di Somma (vds)]

Sorry, wrong browser window! :(

=== modified file 'desktopcouch/records/server_base.py'
--- desktopcouch/records/server_base.py	2010-09-21 08:44:05 +0000
+++ desktopcouch/records/server_base.py	2010-09-29 15:27:41 +0000
@@ -202,17 +202,8 @@
         return self.with_reconnects(self.db.query, map_fun, reduce_fun, language,
               wrapper, **options)
 
-    def get_record(self, record_id):
+    def get_record(self, record_id, hide_deleted=True):
         """Get a record from back end storage."""
-        try:
-            couch_record = self.with_reconnects(self.db.__getitem__, record_id)
-        except ResourceNotFound:
-            return None
-        data = {}
-        if row_is_deleted(couch_record):
-            return None
-        data.update(couch_record)
-        record = self.record_factory(data=data)
 
         def make_getter(source_db, document_id, attachment_name, content_type):
             """Closure storing the database for lower levels to use when needed.
@@ -221,11 +212,23 @@
                 return source_db.get_attachment(document_id, attachment_name), \
                         content_type
             return getter
+
+        try:
+            couch_record = self.with_reconnects(self.db.__getitem__, record_id)
+        except ResourceNotFound:
+            return None
+        data = {}
+
+        if row_is_deleted(couch_record) and hide_deleted:
+            return None
+        data.update(couch_record)
+        record = self.record_factory(data=data)
         if "_attachments" in data:
             for att_name, att_attributes in data["_attachments"].iteritems():
                 record.attach_by_reference(att_name,
                         make_getter(self.db, record_id, att_name,
                                 att_attributes["content_type"]))
+
         return record
 
     def put_record(self, record):

=== modified file 'desktopcouch/records/tests/test_server.py'
--- desktopcouch/records/tests/test_server.py	2010-09-22 13:02:08 +0000
+++ desktopcouch/records/tests/test_server.py	2010-09-29 15:27:41 +0000
@@ -114,6 +114,24 @@
         retrieved_record = self.database.get_record(record_id)
         self.assertEqual(0, retrieved_record['record_number'])
 
+    def test_get_deleted_record(self):
+        """Test getting a record."""
+        record = Record({'record_number': 0}, record_type="http://example.com/")
+        record_id = self.database.put_record(record)
+        self.database.delete_record(record_id)
+        retrieved_record = self.database.get_record(record_id)
+        #FIXME the record has to be None
+        self.assertEqual(retrieved_record, None)
+
+    def test_get_deleted_record_not_hidden(self):
+        """Test getting a record."""
+        record = Record({'record_number': 0}, record_type="http://example.com/")
+        record_id = self.database.put_record(record)
+        self.database.delete_record(record_id)
+        retrieved_record = self.database.get_record(record_id=record_id,
+                                                    hide_deleted=False)
+        self.assertEqual(0, retrieved_record['record_number'])
+
     def test_put_record(self):
         """Test putting a record."""
         record = Record({'record_number': 0}, record_type="http://example.com/")
@@ -149,10 +167,10 @@
         record = Record({'record_number': 0}, record_type="http://example.com/")
         record_id = self.database.put_record(record)
         self.database.delete_record(record_id)
-        ###self.maybe_die()  # should be able to survive couchdb death
-        deleted_record = self.database._server[self.dbname][record_id]
-        #deleted_record = self.database.get_record(record_id)
-        self.assert_(deleted_record['application_annotations']['Ubuntu One'][
+        self.maybe_die()  # should be able to survive couchdb death
+        deleted_record = self.database.get_record(record_id=record_id,
+                                                  hide_deleted=False)
+        self.assert_(deleted_record.application_annotations['Ubuntu One'][
             'private_application_annotations']['deleted'])
 
     def test_delete_and_recreate_record(self):