Merge into trunk : migrate_or_bust : Code : desktopcouch

Status:

Merged

Approved by:

Eric Casteleijn on 2010-11-26

Approved revision:

237

Merged at revision:

230

Proposed branch:

lp://qastaging/~thisfred/desktopcouch/migrate_or_bust

Merge into:

lp://qastaging/desktopcouch

Diff against target:

356 lines (+109/-103)

6 files modified

bin/desktopcouch-get-port (+0/-2)
desktopcouch/application/migration/__init__.py (+40/-35)
desktopcouch/application/migration/tests/test_migration.py (+61/-60)
desktopcouch/application/platform/linux/__init__.py (+1/-0)
desktopcouch/application/start_local_couchdb.py (+6/-3)
desktopcouch/records/database.py (+1/-3)

To merge this branch:

bzr merge lp://qastaging/~thisfred/desktopcouch/migrate_or_bust

High

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Martin Albisetti (community)		Approve on 2010-11-26
Vincenzo Di Somma (community)	2010-11-26	Approve on 2010-11-26
Review via email: mp+41974@code.qastaging.launchpad.net

Commit message

This adds the migration from 'deleted' flags in records, to moving records into the 'dc_trash' database, where deleted records now should live.

Description of the change

This adds the migration from 'deleted' flags in records, to moving records into the 'dc_trash' database, where deleted records now should live.

Revision history for this message

Vincenzo Di Somma (vds) on 2010-11-26:

#

review: Approve

Revision history for this message

Martin Albisetti (beuno) wrote on 2010-11-26:

#

+ """Migrate from deleted falg to the _trash database"""

Typo! You must be so embarrassed....

review: Approve

Revision history for this message

Eric Casteleijn (thisfred) wrote on 2010-11-26:

#

Fixed!

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2010-11-26:

#

Download full text (22.9 KiB)

The attempt to merge lp:~thisfred/desktopcouch/migrate_or_bust into lp:desktopcouch failed. Below is the output from the failed tests.

Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpN8Q8Ep/data/couchdb.html
desktopcouch.application.tests.test_start_local_couchdb
  TestUpdateDesignDocuments
    test_create_databases_and_design_docs ... [OK]
desktopcouch.application.tests.test_service
  TestService
    test_start_desktopcouch_replication ... [OK]
    test_start_new_desktopcouch_extensions ... [OK]
    test_start_new_desktopcouch_no_extensions ... [OK]
desktopcouch.application.tests.test_local_files
  TestKeyringIntegration
    test_with_auth ... [OK]
    test_with_no_auth ... [OK]
  TestLocalFiles
    test_all_files_returned ... [OK]
    test_bind_address ... [OK]
    test_couch_chain_ini_files ... [OK]
    test_xdg_overwrite_works ... [OK]
desktopcouch.application.tests.test_replication
  TestReplication
    test_creation ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmp2SNWIR/data/couchdb.html
                                                     [OK]
  TestUbuntuoneReplication
    test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpJHrddm/data/couchdb.html
                                                    [OK]
desktopcouch.application.migration.tests.test_migration
  TestMigration
    test_migration_deleted_flag_to_trash ... Traceback (most recent call last):
Failure: testtools.testresult.real._StringException: Text attachment: traceback
------------
Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/testtools/runtest.py", line 144, in _run_user
    return fn(*args)
  File "/usr/lib/python2.6/dist-packages/testtools/testcase.py", line 425, in _run_test_method
    testMethod()
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/application/migration/tests/test_migration.py", line 177, in test_migration_deleted_flag_to_trash
    self.assertEqual(self.dbname, private['original_database_name'])
AssertionError: 'test_migration_deleted_flag_to_trash' != 'dc_trash'
------------

[FAIL]
    test_migration_script_is_run ... [OK]
    test_migration_script_is_run_and_can_access_view ... [OK]
  TestRegistration
    test_register_migration_is_added_to_the_registry ... [OK]
desktopcouch.application.pair.tests.test_couchdb_io
  TestCouchdbIo
    test_get_database_names_replicatable ... [OK]
    test_get_my_host_unique_id ... [OK]
    test_mkuri ... [OK]
    test_obsfuscation ... ...

The attempt to merge lp:~thisfred/desktopcouch/migrate_or_bust into lp:desktopcouch failed. Below is the output from the failed tests.

Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpN8Q8Ep/data/couchdb.html
desktopcouch.application.tests.test_start_local_couchdb
  TestUpdateDesignDocuments
    test_create_databases_and_design_docs ...                              [OK]
desktopcouch.application.tests.test_service
  TestService
    test_start_desktopcouch_replication ...                                [OK]
    test_start_new_desktopcouch_extensions ...                             [OK]
    test_start_new_desktopcouch_no_extensions ...                          [OK]
desktopcouch.application.tests.test_local_files
  TestKeyringIntegration
    test_with_auth ...                                                     [OK]
    test_with_no_auth ...                                                  [OK]
  TestLocalFiles
    test_all_files_returned ...                                            [OK]
    test_bind_address ...                                                  [OK]
    test_couch_chain_ini_files ...                                         [OK]
    test_xdg_overwrite_works ...                                           [OK]
desktopcouch.application.tests.test_replication
  TestReplication
    test_creation ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmp2SNWIR/data/couchdb.html
                                                     [OK]
  TestUbuntuoneReplication
    test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpJHrddm/data/couchdb.html
                                                    [OK]
desktopcouch.application.migration.tests.test_migration
  TestMigration
    test_migration_deleted_flag_to_trash ... Traceback (most recent call last):
Failure: testtools.testresult.real._StringException: Text attachment: traceback
------------
Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/testtools/runtest.py", line 144, in _run_user
    return fn(*args)
  File "/usr/lib/python2.6/dist-packages/testtools/testcase.py", line 425, in _run_test_method
    testMethod()
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/application/migration/tests/test_migration.py", line 177, in test_migration_deleted_flag_to_trash
    self.assertEqual(self.dbname, private['original_database_name'])
AssertionError: 'test_migration_deleted_flag_to_trash' != 'dc_trash'
------------

[FAIL]
    test_migration_script_is_run ...                                       [OK]
    test_migration_script_is_run_and_can_access_view ...                   [OK]
  TestRegistration
    test_register_migration_is_added_to_the_registry ...                   [OK]
desktopcouch.application.pair.tests.test_couchdb_io
  TestCouchdbIo
    test_get_database_names_replicatable ...                               [OK]
    test_get_my_host_unique_id ...                                         [OK]
    test_mkuri ...                                                         [OK]
    test_obsfuscation ...                                                  [OK]
    test_put_dynamic_paired_host ...                                       [OK]
    test_put_static_paired_service ...                                     [OK]
desktopcouch.application.pair.tests.test_ubuntuone_pairing
  TestUbuntonePairing
    test_pair_with_ubuntuone_no_record ...                                 [OK]
    test_pair_with_ubuntuone_no_view ...                                   [OK]
    test_pair_with_ubuntuone_record_present ...                            [OK]
    test_pair_with_ubuntuone_user_deleted_record ...                       [OK]
desktopcouch.application.pair.tests.test_network_io
  TestNetworkIO
    test_successful_lifespan ...                                           [OK]
desktopcouch.records.tests.test_field_registry
  TestFieldMapping
    test_mergeable_list_field_mapping0 ...                                 [OK]
    test_mergeable_list_field_mapping1 ...                                 [OK]
    test_mergeable_list_field_mapping_empty_field ...                      [OK]
    test_simple_field_mapping ...                                          [OK]
  TestTransformer
    test_from_app ...                                                      [OK]
    test_from_app_with_record ...                                          [OK]
    test_run_doctests ...                                                  [OK]
    test_to_app ...                                                        [OK]
    test_to_app_with_dictionary ...                                        [OK]
desktopcouch.records.tests.test_server
  TestCouchDatabaseDeprecated
    test_func_get_records ... /var/cache/tarmac/desktopcouch/trunk/desktopcouch/records/tests/test_server.py:129: DeprecationWarning: .get_records is deprecated, use .get_all_records instead
/usr/lib/python2.6/dist-packages/testtools/testcase.py:253: DeprecationWarning: .get_records is deprecated, use .get_all_records instead
                                             [OK]
    test_get_records_by_record_type_save_view ... /var/cache/tarmac/desktopcouch/trunk/desktopcouch/records/tests/test_server.py:102: DeprecationWarning: .get_records is deprecated, use .get_all_records instead
                         [OK]
    test_get_view_by_type_createxcl_fail ... /var/cache/tarmac/desktopcouch/trunk/desktopcouch/records/tests/test_server.py:154: DeprecationWarning: .get_records is deprecated, use .get_all_records instead
                              [OK]
    test_get_view_by_type_new_but_already ... /var/cache/tarmac/desktopcouch/trunk/desktopcouch/records/tests/test_server.py:147: DeprecationWarning: .get_records is deprecated, use .get_all_records instead
/var/cache/tarmac/desktopcouch/trunk/desktopcouch/records/tests/test_server.py:149: DeprecationWarning: .get_records is deprecated, use .get_all_records instead
                             [OK]
  TestDesktopDatabase
    test_attachments ...                                                   [OK]
    test_database_not_exists ...                                           [OK]
    test_delete_and_recreate_record ...                                    [OK]
    test_delete_record ...                                                 [OK]
    test_func_get_all_records ...                                          [OK]
    test_get_changes ...                                                   [OK]
    test_get_deleted_record ...                                            [OK]
    test_get_record ...                                                    [OK]
    test_get_records_by_record_type_save_view ...                          [OK]
    test_get_view_by_type_new_but_already ...                              [OK]
    test_list_views ...                                                    [OK]
    test_put_record ...                                                    [OK]
    test_put_records_batch ...                                             [OK]
    test_record_exists ...                                                 [OK]
    test_report_changes_all_ops_give_known_keys ...                        [OK]
    test_report_changes_exceptions ...                                     [OK]
    test_report_changes_nochanges ...                                      [OK]
    test_report_changes_polite ...                                         [OK]
    test_update_fields ...                                                 [OK]
    test_update_fields_failure ...                                         [OK]
    test_update_fields_success ...                                         [OK]
    test_view_add_and_delete ...                                           [OK]
    test_view_fetch ...                                                    [OK]
desktopcouch.records.tests.test_record
  TestMergeableList
    test_abc ...                                                           [OK]
    test_append ...                                                        [OK]
    test_del ...                                                           [OK]
    test_index ...                                                         [OK]
    test_insert ...                                                        [OK]
    test_is_mergeable_list ...                                             [OK]
    test_pop ...                                                           [OK]
    test_pop_no_index ...                                                  [OK]
    test_pop_wrong_index ...                                               [OK]
    test_remove ...                                                        [OK]
    test_remove_missing ...                                                [OK]
  TestRecordDict
    test_abc ...                                                           [OK]
  TestRecordFactory
    test_build ...                                                         [OK]
  TestRecords
    test_application_annotations ...                                       [OK]
    test_delitem ...                                                       [OK]
    test_dictionary_access_to_mergeable_list ...                           [OK]
    test_get ...                                                           [OK]
    test_get_item ...                                                      [OK]
    test_iter ...                                                          [OK]
    test_keys ...                                                          [OK]
    test_list ...                                                          [OK]
    test_loads_dict_multi_subdict ...                                      [OK]
    test_loads_dict_subdict ...                                            [OK]
    test_mergeable_list ...                                                [OK]
    test_no_record_type ...                                                [OK]
    test_record_id ...                                                     [OK]
    test_record_type ...                                                   [OK]
    test_record_type_version ...                                           [OK]
    test_revision ...                                                      [OK]
    test_run_doctests ...                                                  [OK]
    test_setitem_internal ...                                              [OK]
    test_uuid_like_keys ...                                                [OK]
    test_validate ...                                                      [OK]
desktopcouch.recordtypes.tests.test_tasks
  TestTaskRecord
    test_task_record ...                                                   [OK]
desktopcouch.recordtypes.tests.test_bookmarks
  TestBookmarkRecord
    test_bookmark_record ...                                               [OK]
  TestFeedRecord
    test_feed_record ...                                                   [OK]
  TestFolderRecord
    test_folder_record ...                                                 [OK]
  TestSeparatorRecord
    test_separator_record ...                                              [OK]
desktopcouch.recordtypes.tests.test_notes
  TestNoteRecord
    test_note_record ...                                                   [OK]
desktopcouch.recordtypes.contacts.tests.test_create
  TestCreate
    test_create_many_contacts ...                                          [OK]
    test_head_or_tails ...                                                 [OK]
    test_random_bools ...                                                  [OK]
desktopcouch.recordtypes.contacts.tests.test_record
  TestContactRecord
    test_contact_record ...                                                [OK]
desktopcouch.recordtypes.contacts.tests.test_view
  TestLocalFiles
    test_find_contact_starting ...                                         [OK]
    test_find_contacts_exact ...                                           [OK]

===============================================================================
[FAIL]: desktopcouch.application.migration.tests.test_migration.TestMigration.test_migration_deleted_flag_to_trash

Traceback (most recent call last):
Failure: testtools.testresult.real._StringException: Text attachment: traceback
------------
Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/testtools/runtest.py", line 144, in _run_user
    return fn(*args)
  File "/usr/lib/python2.6/dist-packages/testtools/testcase.py", line 425, in _run_test_method
    testMethod()
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/application/migration/tests/test_migration.py", line 177, in test_migration_deleted_flag_to_trash
    self.assertEqual(self.dbname, private['original_database_name'])
AssertionError: 'test_migration_deleted_flag_to_trash' != 'dc_trash'
------------

-------------------------------------------------------------------------------
Ran 108 tests in 36.327s

FAILED (failures=1, successes=107)
Name                                                              Stmts   Exec  Cover
-------------------------------------------------------------------------------------
desktopcouch/__init__                                                 0      0   100%
desktopcouch/application/__init__                                     0      0   100%
desktopcouch/application/local_files                                165    145    87%
desktopcouch/application/migration/__init__                          39     35    89%
desktopcouch/application/migration/tests/__init__                     0      0   100%
desktopcouch/application/migration/tests/test_migration              77     74    96%
desktopcouch/application/pair/__init__                                2      2   100%
desktopcouch/application/pair/couchdb_pairing/__init__                1      1   100%
desktopcouch/application/pair/couchdb_pairing/couchdb_io            188    105    55%
desktopcouch/application/pair/couchdb_pairing/dbus_io               131     37    28%
desktopcouch/application/pair/couchdb_pairing/network_io            173    161    93%
desktopcouch/application/pair/couchdb_pairing/ubuntuone_pairing      21     20    95%
desktopcouch/application/pair/tests/__init__                          1      1   100%
desktopcouch/application/pair/tests/test_couchdb_io                  68     68   100%
desktopcouch/application/pair/tests/test_network_io                  58     54    93%
desktopcouch/application/pair/tests/test_ubuntuone_pairing           51     51   100%
desktopcouch/application/platform/__init__                           22     13    59%
desktopcouch/application/platform/linux/__init__                    100     61    61%
desktopcouch/application/platform/linux/base_dirs                    13      8    61%
desktopcouch/application/platform/linux/ipc                          15      7    46%
desktopcouch/application/platform/linux/keyring                      40     10    25%
desktopcouch/application/platform/windows/__init__                    2      0     0%
desktopcouch/application/replication                                138     17    12%
desktopcouch/application/replication_services/__init__                2      2   100%
desktopcouch/application/replication_services/example                 7      5    71%
desktopcouch/application/replication_services/ubuntuone              99     52    52%
desktopcouch/application/server                                      40     34    85%
desktopcouch/application/service                                     92     87    94%
desktopcouch/application/start_local_couchdb                        135    105    77%
desktopcouch/application/stop_local_couchdb                          17      6    35%
desktopcouch/application/tests/__init__                              85     69    81%
desktopcouch/application/tests/test_local_files                      57     56    98%
desktopcouch/application/tests/test_replication                      34     34   100%
desktopcouch/application/tests/test_service                          83     83   100%
desktopcouch/application/tests/test_start_local_couchdb              47     47   100%
desktopcouch/application/util                                         6      6   100%
desktopcouch/bookmarks/__init__                                       0      0   100%
desktopcouch/bookmarks/record                                         3      0     0%
desktopcouch/contacts/__init__                                        0      0   100%
desktopcouch/contacts/record                                          3      0     0%
desktopcouch/contacts/view                                            3      0     0%
desktopcouch/local_files                                              3      0     0%
desktopcouch/notes/__init__                                           0      0   100%
desktopcouch/notes/record                                             3      0     0%
desktopcouch/pair/__init__                                            3      0     0%
desktopcouch/pair/couchdb_pairing/__init__                            0      0   100%
desktopcouch/pair/couchdb_pairing/couchdb_io                          3      0     0%
desktopcouch/pair/couchdb_pairing/dbus_io                             3      0     0%
desktopcouch/pair/couchdb_pairing/network_io                          3      0     0%
desktopcouch/pair/couchdb_pairing/ubuntuone_pairing                   3      0     0%
desktopcouch/records/__init__                                       255    242    94%
desktopcouch/records/database                                       298    278    93%
desktopcouch/records/field_registry                                 114     91    79%
desktopcouch/records/server                                           3      0     0%
desktopcouch/records/server_base                                      3      0     0%
desktopcouch/records/tests/__init__                                   1      1   100%
desktopcouch/records/tests/test_field_registry                       81     78    96%
desktopcouch/records/tests/test_record                              188    185    98%
desktopcouch/records/tests/test_server                              385    359    93%
desktopcouch/recordtypes/__init__                                     0      0   100%
desktopcouch/recordtypes/bookmarks                                   18     18   100%
desktopcouch/recordtypes/contacts/__init__                           26     26   100%
desktopcouch/recordtypes/contacts/testing/__init__                    1      1   100%
desktopcouch/recordtypes/contacts/testing/create                     83     82    98%
desktopcouch/recordtypes/contacts/tests/__init__                      1      1   100%
desktopcouch/recordtypes/contacts/tests/test_create                  21     21   100%
desktopcouch/recordtypes/contacts/tests/test_record                  17     17   100%
desktopcouch/recordtypes/contacts/tests/test_view                    55     55   100%
desktopcouch/recordtypes/contacts/view                               20     18    90%
desktopcouch/recordtypes/notes                                       11     11   100%
desktopcouch/recordtypes/tasks                                        7      7   100%
desktopcouch/recordtypes/tests/__init__                               0      0   100%
desktopcouch/recordtypes/tests/test_bookmarks                        19     19   100%
desktopcouch/recordtypes/tests/test_notes                            15     15   100%
desktopcouch/recordtypes/tests/test_tasks                            11     11   100%
desktopcouch/replication                                              3      0     0%
desktopcouch/replication_services/__init__                            3      0     0%
desktopcouch/replication_services/example                             3      0     0%
desktopcouch/replication_services/ubuntuone                           3      0     0%
desktopcouch/service                                                  3      0     0%
desktopcouch/start_local_couchdb                                      7      0     0%
desktopcouch/stop_local_couchdb                                       6      0     0%
desktopcouch/tasks/__init__                                           0      0   100%
desktopcouch/tasks/record                                             3      0     0%
desktopcouch/tests/__init__                                           3      0     0%
desktopcouch/util                                                     3      0     0%
-------------------------------------------------------------------------------------
TOTAL                                                              3709   2992    80%
Apache CouchDB has been shutdown.
Apache CouchDB has been shutdown.
Apache CouchDB has been shutdown.

+ u1trial -c desktopcouch
DEBUG:root:starting dbus main loop
DEBUG:root:ending dbus main loop
INFO:root:exiting.
WARNING:root:shutting down personal couchdb.
dbus 2010-11-26 14:45:43,438 - shutting down personal couchdb.
WARNING:root:Starting up personal couchdb.
dbus 2010-11-26 14:45:43,467 - Starting up personal couchdb.
DEBUG:root:starting dbus main loop
DEBUG:root:ending dbus main loop
INFO:root:exiting.
WARNING:root:shutting down personal couchdb.
dbus 2010-11-26 14:45:43,469 - shutting down personal couchdb.
dbus 2010-11-26 14:45:43,469 - shutting down personal couchdb.
INFO:root:Migrating DB: <desktopcouch.application.server.DesktopDatabase object at 0xa9fbcac>
INFO:root:Migrating DB: <desktopcouch.application.server.DesktopDatabase object at 0xa9eb30c>
INFO:root:Migrating DB: <desktopcouch.application.server.DesktopDatabase object at 0xa9f528c>
INFO:root:Migrating DB: <desktopcouch.application.server.DesktopDatabase object at 0xa9f170c>
INFO:root:Migrating DB: <desktopcouch.application.server.DesktopDatabase object at 0xaa020ec>
DEBUG:root:Got list of databases from <DesktopServer 'http://localhost:45448'>:
    set(['foo', 'management', 'bar', 'apple', '_users'])
DEBUG:root:found 1 excluded_names records
DEBUG:root:found 0 self_identity records
DEBUG:root:set new self-identity value: 'ea382af5-c7ab-4639-84ce-647a401e08db'
DEBUG:root:found 1 self_identity records
DEBUG:root:Pairing desktopcouch with Ubuntu One
DEBUG:root:Pairing desktopcouch with Ubuntu One
DEBUG:root:Not adding desktopcouch pairing since we are already paired
DEBUG:root:Not adding desktopcouch pairing since the user has explicitly unpaired with Ubuntu One
INFO:ListenForInvitations:local port to receive invitations is 47370
DEBUG:SendInvitationFactory:initialized
DEBUG:SendInvitationProtocol:initialized
DEBUG:SendInvitationProtocol:connection made
INFO:ProcessAnInvitationProtocol:User secret 'sek' is wrong.
INFO:ProcessAnInvitationProtocol:User secret '' is wrong.
INFO:ProcessAnInvitationProtocol:User secret '                                  fs' is wrong.
DEBUG:ProcessAnInvitationProtocol:User knew secret!
DEBUG:ProcessAnInvitationProtocol:connection lost
INFO:SendInvitationProtocol:connection lost.
INFO:SendInvitationFactory:connection lost. [Failure instance: Traceback (failure with no frames): <class 'twisted.internet.error.ConnectionDone'>: Connection was closed cleanly.
]
cat: /tmp/tmpJHrddm/cache/desktop-couchdb.pid: No such file or directory

Revision history for this message

Eric Casteleijn (thisfred) wrote on 2010-11-26:

#

Oops, forgot to exclude dc_trash from migration.

desktopcouch

Merge lp://qastaging/~thisfred/desktopcouch/migrate_or_bust into lp://qastaging/desktopcouch

Commit message

Description of the change

Preview Diff

Subscribers