Merge lp:~thisfred/desktopcouch/fix-deletion-migration-view into lp:desktopcouch

[Eric Casteleijn]

Fixes the view for the deletion migration so it does not break on couchdb documents with no record_type.

Fixes the view for the deletion migration so it does not break on couchdb documents with no record_type.

[Martin Albisetti (beuno)]

review: Approve

[Vincenzo Di Somma (vds)]

review: Approve

=== modified file 'desktopcouch/application/migration/__init__.py'
--- desktopcouch/application/migration/__init__.py	2010-11-26 22:06:03 +0000
+++ desktopcouch/application/migration/__init__.py	2011-01-05 17:49:15 +0000
@@ -58,7 +58,6 @@
         if not dbs:
             dbs = all_dbs
         for db_name in dbs:
-            print db_name
             db = server.DesktopDatabase(database=db_name, ctx=ctx)
             try:
                 migration['method'](db)
@@ -71,7 +70,7 @@
 DELETION_VIEW_CODE = """
     function(doc) {
         if (doc['application_annotations']['Ubuntu One']
-        ['private_application_annotations']['deleted']) {
+        ['private_application_annotations']['deleted'] && doc.record_type) {
         emit(doc.id, doc.id);
         }
     }"""

=== modified file 'desktopcouch/application/migration/tests/test_migration.py'
--- desktopcouch/application/migration/tests/test_migration.py	2010-12-08 19:59:58 +0000
+++ desktopcouch/application/migration/tests/test_migration.py	2011-01-05 17:49:15 +0000
@@ -25,12 +25,13 @@
 import testtools
 
 from couchdb.http import ResourceNotFound
+from uuid import uuid4
 
 from desktopcouch.application import migration
 import desktopcouch.application.tests as test_environment
 from desktopcouch.application.server import DesktopDatabase
 from desktopcouch.records import Record, NoRecordTypeSpecified
-from desktopcouch.records.database import DCTRASH
+from desktopcouch.records.database import DCTRASH, base_n
 from desktopcouch.application.stop_local_couchdb import stop_couchdb
 
 
@@ -49,6 +50,7 @@
 
     def setUp(self):
         """setup each test"""
+        self.old_registry = migration.MIGRATIONS_REGISTRY[:]
         super(MigrationBase, self).setUp()
         self.ctx = get_test_context()
         self.dbname = self._testMethodName
@@ -66,6 +68,7 @@
         if this_context != test_environment.test_context:
             stop_couchdb(ctx=this_context)
         super(MigrationBase, self).tearDown()
+        migration.MIGRATIONS_REGISTRY = self.old_registry[:]
 
 
 class TestRegistration(MigrationBase):
@@ -88,11 +91,11 @@
 
     def test_register_migration_is_added_to_the_registry(self):
         """Test that the migration script is correctly registered."""
-        size = len(migration.MIGRATIONS_REGISTRY)
+        migration.MIGRATIONS_REGISTRY = []
         migration.register(migration_method=fake_migration, dbs=[self.dbname])
         self.assertEqual([{'method': fake_migration, 'dbs': [self.dbname]}],
             migration.MIGRATIONS_REGISTRY)
-        self.assertEqual(size + 1, len(migration.MIGRATIONS_REGISTRY))
+        self.assertEqual(1, len(migration.MIGRATIONS_REGISTRY))
 
 
 class TestMigration(MigrationBase):
@@ -113,7 +116,6 @@
     def tearDown(self):
         """tear down each test"""
         super(TestMigration, self).tearDown()
-        migration.MIGRATIONS_REGISTRY = []
         try:
             del self.database._server[DCTRASH]
         except ResourceNotFound:
@@ -127,7 +129,6 @@
             # just asserting something to check this code is run
             # and get the right db as argument
             self.assertEqual(self.dbname, database.db.name)
-
         migration.register(
             migration_method=simple_migration, dbs=[self.dbname])
         migration.run_needed_migrations(ctx=self.ctx)
@@ -180,6 +181,7 @@
             Record({
                 'key1_1': 'val1_1',
                 'record_type': 'test.com'}))
+
         migration.run_needed_migrations(ctx=self.ctx)
         # Record no longer exists in database
         self.assertIs(None, self.database.get_record(record_id))
@@ -197,3 +199,37 @@
                 'private_application_annotations']
             self.assertEqual(self.dbname, private['original_database_name'])
             self.assertEqual(record_id, private['original_id'])
+
+    def test_migration_in_face_of_broken_records(self):
+        """Test that the migration does not break when we have a
+        'record' without a record_type.
+
+        """
+        # pylint: disable=E1101
+        record_id = base_n(uuid4().int, 62)
+        self.database.db[record_id] = {
+            "results": [],
+            "last_seq": 1973,
+            "application_annotations": {
+                "Ubuntu One": {
+                    "private_application_annotations": {
+                        "deleted": True}}}}
+        undeleted_record_id1 = base_n(uuid4().int, 62)
+        self.database.db[undeleted_record_id1] = {
+            'key1_1': 'val1_1',
+            'application_annotations': {
+                'Ubuntu One': {
+                    'private_application_annotations': {
+                        'deleted': False}}}}
+        undeleted_record_id2 = base_n(uuid4().int, 62)
+        self.database.db[undeleted_record_id2] = {
+            'key1_1': 'val1_1'}
+        # pylint: enable=E1101
+        migration.run_needed_migrations(ctx=self.ctx)
+        # None of them are deleted, since they are not records
+        self.assertIn(record_id, self.database.db)
+        self.assertIn(undeleted_record_id1, self.database.db)
+        self.assertIn(undeleted_record_id2, self.database.db)
+        self.assertNotIn(record_id, self.trash.db)
+        self.assertNotIn(undeleted_record_id1, self.trash.db)
+        self.assertNotIn(undeleted_record_id2, self.trash.db)

=== removed directory 'po'
=== removed file 'po/POTFILES.in'
--- po/POTFILES.in	2009-08-19 19:14:24 +0000
+++ po/POTFILES.in	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-desktopcouch-pair.desktop.in
-bin/desktopcouch-pair