Merge into trunk : find-u1-credentials : Code : desktopcouch

Status:

Merged

Approved by:

Natalia Bidart on 2011-01-03

Approved revision:

245

Merged at revision:

242

Proposed branch:

lp://qastaging/~nataliabidart/desktopcouch/find-u1-credentials

Merge into:

lp://qastaging/desktopcouch

Diff against target:

120 lines (+46/-15)

2 files modified

desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py (+32/-9)
desktopcouch/application/plugins/ubuntuone_pairing.py (+14/-6)

To merge this branch:

bzr merge lp://qastaging/~nataliabidart/desktopcouch/find-u1-credentials

Related bugs:

Bug #669645: Use SSO new interface (CredentialsManagement)	Medium	Fix Released
Bug #694495: ubuntuone pairing should call find_credentials	High	Fix Released

Link a bug report

Reviewer	Date Requested	Status
Samuele Pedroni		Approve on 2011-01-03
dobey (community)	2011-01-03	Approve on 2011-01-03
Review via email: mp+45032@code.qastaging.launchpad.net

Commit message

ubuntu_sso.find_credentials must be called when pairing ubuntu one records, so we can use U1 credentials if already on the system (LP: #694495).

Revision history for this message

dobey (dobey) on 2011-01-03:

#

review: Approve

Revision history for this message

Samuele Pedroni (pedronis) wrote on 2011-01-03:

#

looks good, I still think even if ImportError is quite specific it would be better if the try except would bracket only the imports and not so much code

review: Approve

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2011-01-03:

#

Download full text (23.7 KiB)

The attempt to merge lp:~nataliabidart/desktopcouch/find-u1-credentials 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/tmp6bDFA6/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/tmpEnB1xn/data/couchdb.html
                                                     [OK]
  TestUbuntuoneReplication
    test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpfnK3HZ/data/couchdb.html
                                                    [OK]
desktopcouch.application.migration.tests.test_migration
  TestMigration
    test_migration_deleted_flag_to_trash ... test_migration_deleted_flag_to_trash
apple
                              [OK]
    test_migration_script_is_run ... test_migration_script_is_run
                                      [OK]
    test_migration_script_is_run_and_can_access_view ... test_migration_script_is_run_and_can_access_view
                  [OK]
  TestRegistration
    test_register_migration_is_added_to_the_registry ... [OK]
desktopcouch.application.platform.windows.tests.test_keyring
  TestKeyring
    test_get_oauth_data ... [OK]
    test_get_user_name_password ... [OK]
    test_get_user_name_password_no_key ... [OK]
    test_get_user_name_password_no_value ... [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_servic...

The attempt to merge lp:~nataliabidart/desktopcouch/find-u1-credentials 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/tmp6bDFA6/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/tmpEnB1xn/data/couchdb.html
                                                     [OK]
  TestUbuntuoneReplication
    test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpfnK3HZ/data/couchdb.html
                                                    [OK]
desktopcouch.application.migration.tests.test_migration
  TestMigration
    test_migration_deleted_flag_to_trash ... test_migration_deleted_flag_to_trash
apple
                              [OK]
    test_migration_script_is_run ... test_migration_script_is_run
                                      [OK]
    test_migration_script_is_run_and_can_access_view ... test_migration_script_is_run_and_can_access_view
                  [OK]
  TestRegistration
    test_register_migration_is_added_to_the_registry ...                   [OK]
desktopcouch.application.platform.windows.tests.test_keyring
  TestKeyring
    test_get_oauth_data ...                                                [OK]
    test_get_user_name_password ...                                        [OK]
    test_get_user_name_password_no_key ...                                 [OK]
    test_get_user_name_password_no_value ...                               [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_network_io
  TestNetworkIO
    test_successful_lifespan ...                                           [OK]
desktopcouch.application.plugins.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]
  TestUbuntuOnePlugin
    test_got_new_credentials ...                                           [OK]
    test_got_new_credentials_other ...                                     [OK]
    test_listen_to_dbus ...                                                [OK]
desktopcouch.records.tests.test_field_registry
  TestFieldMapping
    test_list_to_mergeable_list_field_mapping1 ...                         [OK]
    test_list_to_mergeable_list_field_mapping2 ...                         [OK]
    test_list_to_mergeable_list_with_subfield1 ...                         [OK]
    test_list_to_mergeable_list_with_subfield2 ...                         [OK]
    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 ...                                              [OK]
    test_get_records_by_record_type_save_view ...                          [OK]
    test_get_view_by_type_createxcl_fail ...                               [OK]
    test_get_view_by_type_new_but_already ...                              [OK]
  TestDesktopDatabase
    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]

-------------------------------------------------------------------------------
Ran 118 tests in 39.435s

PASSED (successes=118)
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__                        40     36    90%
desktopcouch/application/migration/tests/__init__                   0      0   100%
desktopcouch/application/migration/tests/test_migration            95     90    94%
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/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/platform/__init__                         22     13    59%
desktopcouch/application/platform/linux/__init__                  108     64    59%
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      1    50%
desktopcouch/application/platform/windows/keyring                  65     61    93%
desktopcouch/application/platform/windows/tests/__init__            0      0   100%
desktopcouch/application/platform/windows/tests/test_keyring      150    150   100%
desktopcouch/application/plugins/__init__                          21      4    19%
desktopcouch/application/plugins/tests/__init__                     0      0   100%
desktopcouch/application/plugins/tests/test_ubuntuone_pairing      84     83    98%
desktopcouch/application/plugins/ubuntuone_pairing                 42     36    85%
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                                    38     32    84%
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    213    83%
desktopcouch/records/database                                     264    234    88%
desktopcouch/records/field_registry                               150    121    80%
desktopcouch/records/http                                         159    121    76%
desktopcouch/records/record                                         3      0     0%
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                    118    115    97%
desktopcouch/records/tests/test_record                            188    185    98%
desktopcouch/records/tests/test_server                            394    330    83%
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      3   100%
desktopcouch/util                                                   3      0     0%
-----------------------------------------------------------------------------------
TOTAL                                                            4234   3363    79%
Apache CouchDB has been shutdown.
Apache CouchDB has been shutdown.
Apache CouchDB has been shutdown.
== Python Lint Notices ==

bin/desktopcouch-pair:
    285:  [W0511] FIXME

bin/desktopcouch-service:
    42:  [W0511] TODO

desktopcouch/application/pair/__init__.py:
    19:  [W0511] FIXME constants should be upper case

desktopcouch/application/pair/couchdb_pairing/network_io.py:
    127:  [W0511] FIXME
    142:  [W0511] FIXME
    147:  [W0511] FIXME
    153:  [W0511] FIXME
    234:  [W0511] FIXME
    253:  [W0511] FIXME
    273:  [W0511] FIXME
    300:  [W0511] FIXME
    302:  [W0511] FIXME
    311:  [W0511] FIXME

desktopcouch/application/platform/linux/ipc.py:
    42:  [W0511] FIXME change this to get_port

desktopcouch/application/platform/windows/__init__.py:
    4:  [W0511] FIXME make thisdo something or document why it does not

desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py:
    78:  [W0511] FIXME does this do anything?
    94:  [W0511] FIXME does this do anything?
    23:  [W0611] Unused import Mocker

desktopcouch/application/replication.py:
    152:  [W0511] TODO
    174:  [W0511] TODO
    251:  [W0511] TODO

desktopcouch/application/replication_services/example.py:
    8:  [W0511] FIXME all of the constants should be capitalized, but that needs to

desktopcouch/application/start_local_couchdb.py:
    136:  [W0511] FIXME base may have magic chars. assert not glob.has_magic(base)?
    148:  [W0511] FIXME
    169:  [W0511] XXX check whether this already exists or not, rather

desktopcouch/application/tests/__init__.py:
    149:  [W0511] TODO

desktopcouch/application/tests/test_local_files.py:
    50:  [W0511] XXX

desktopcouch/application/tests/test_replication.py:
    25:  [W0511] XXX

desktopcouch/application/tests/test_service.py:
    69:  [W0511] XXX
    99:  [W0511] XXX

desktopcouch/records/tests/test_server.py:
    643:  [W0511] XXX I took out the assertion that data was sorted, since

desktopcouch/recordtypes/contacts/tests/test_create.py:
    64:  [W0511] XXX Asssert something

+ 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 2011-01-03 11:32:33,062 - shutting down personal couchdb.
WARNING:root:Starting up personal couchdb.
dbus 2011-01-03 11:32:33,078 - 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 2011-01-03 11:32:33,080 - shutting down personal couchdb.
dbus 2011-01-03 11:32:33,080 - shutting down personal couchdb.
INFO:root:Migrating DB: <desktopcouch.application.server.DesktopDatabase object at 0xa951b4c>
INFO:root:Migrating DB: <desktopcouch.application.server.DesktopDatabase object at 0xa9482cc>
INFO:root:Migrating DB: <desktopcouch.application.server.DesktopDatabase object at 0xa94892c>
INFO:root:Migrating DB: <desktopcouch.application.server.DesktopDatabase object at 0xa9537ac>
DEBUG:root:Got list of databases from <DesktopServer 'http://localhost:32785'>:
    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: 'cd412077-2cad-44d3-87d2-9d4979f7c59a'
DEBUG:root:found 1 self_identity records
INFO:ListenForInvitations:local port to receive invitations is 44614
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.
]
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
+ u1lint
/usr/lib/pymodules/python2.7/gtk-2.0/gtk/__init__.py:57: GtkWarning: could not open display
  warnings.warn(str(e), _gtk.Warning)

lp://qastaging/~nataliabidart/desktopcouch/find-u1-credentials updated on 2011-01-03

244. By Natalia Bidart on 2011-01-03: Removed unused import.
245. By Natalia Bidart on 2011-01-03: Merged trunk in.

desktopcouch

Merge lp://qastaging/~nataliabidart/desktopcouch/find-u1-credentials into lp://qastaging/desktopcouch

Commit message

Description of the change

Preview Diff

Subscribers