Merge into trunk : remove_quickly : Code : desktopcouch

Status:

Merged

Approved by:

Eric Casteleijn on 2010-11-01

Approved revision:

185

Merged at revision:

189

Proposed branch:

lp://qastaging/~mandel/desktopcouch/remove_quickly

Merge into:

lp://qastaging/desktopcouch

Diff against target:

383 lines (+0/-369)

3 files modified

desktopcouch/contacts/contactspicker.py (+0/-82)
desktopcouch/contacts/tests/test_contactspicker.py (+0/-56)
desktopcouch/records/tests/test_couchgrid.py (+0/-231)

To merge this branch:

bzr merge lp://qastaging/~mandel/desktopcouch/remove_quickly

Low

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Eric Casteleijn (community)		Approve on 2010-10-31
Vincenzo Di Somma (community)	2010-10-30	Approve on 2010-10-30
Review via email: mp+39691@code.qastaging.launchpad.net

Commit message

Removes the quickly code since it is not longer used.

Description of the change

Removes the quickly code since it is not longer used.

Revision history for this message

Vincenzo Di Somma (vds) wrote on 2010-10-30:

#

Thanks!

review: Approve

Revision history for this message

Eric Casteleijn (thisfred) wrote on 2010-10-31:

#

+1

review: Approve

Revision history for this message

dobey (dobey) wrote on 2010-11-01:

#

Download full text (18.1 KiB)

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

running build
running build_py
creating build
creating build/lib.linux-i686-2.6
creating build/lib.linux-i686-2.6/desktopcouch
copying desktopcouch/stop_local_couchdb.py -> build/lib.linux-i686-2.6/desktopcouch
copying desktopcouch/start_local_couchdb.py -> build/lib.linux-i686-2.6/desktopcouch
copying desktopcouch/replication.py -> build/lib.linux-i686-2.6/desktopcouch
copying desktopcouch/local_files.py -> build/lib.linux-i686-2.6/desktopcouch
copying desktopcouch/__init__.py -> build/lib.linux-i686-2.6/desktopcouch
copying desktopcouch/service.py -> build/lib.linux-i686-2.6/desktopcouch
creating build/lib.linux-i686-2.6/desktopcouch/tests
copying desktopcouch/tests/test_start_local_couchdb.py -> build/lib.linux-i686-2.6/desktopcouch/tests
copying desktopcouch/tests/test_service.py -> build/lib.linux-i686-2.6/desktopcouch/tests
copying desktopcouch/tests/test_local_files.py -> build/lib.linux-i686-2.6/desktopcouch/tests
copying desktopcouch/tests/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/tests
copying desktopcouch/tests/test_replication.py -> build/lib.linux-i686-2.6/desktopcouch/tests
creating build/lib.linux-i686-2.6/desktopcouch/tasks
copying desktopcouch/tasks/record.py -> build/lib.linux-i686-2.6/desktopcouch/tasks
copying desktopcouch/tasks/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/tasks
creating build/lib.linux-i686-2.6/desktopcouch/pair
copying desktopcouch/pair/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/pair
creating build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/field_registry.py -> build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/record.py -> build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/server.py -> build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/couchgrid.py -> build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/server_base.py -> build/lib.linux-i686-2.6/desktopcouch/records
creating build/lib.linux-i686-2.6/desktopcouch/replication_services
copying desktopcouch/replication_services/ubuntuone.py -> build/lib.linux-i686-2.6/desktopcouch/replication_services
copying desktopcouch/replication_services/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/replication_services
copying desktopcouch/replication_services/example.py -> build/lib.linux-i686-2.6/desktopcouch/replication_services
creating build/lib.linux-i686-2.6/desktopcouch/notes
copying desktopcouch/notes/record.py -> build/lib.linux-i686-2.6/desktopcouch/notes
copying desktopcouch/notes/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/notes
creating build/lib.linux-i686-2.6/desktopcouch/bookmarks
copying desktopcouch/bookmarks/record.py -> build/lib.linux-i686-2.6/desktopcouch/bookmarks
copying desktopcouch/bookmarks/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/bookmarks
creating build/lib.linux-i686-2.6/desktopcouch/contacts
copying desktopcouch/contacts/record.py -> build/lib....

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

running build
running build_py
creating build
creating build/lib.linux-i686-2.6
creating build/lib.linux-i686-2.6/desktopcouch
copying desktopcouch/stop_local_couchdb.py -> build/lib.linux-i686-2.6/desktopcouch
copying desktopcouch/start_local_couchdb.py -> build/lib.linux-i686-2.6/desktopcouch
copying desktopcouch/replication.py -> build/lib.linux-i686-2.6/desktopcouch
copying desktopcouch/local_files.py -> build/lib.linux-i686-2.6/desktopcouch
copying desktopcouch/__init__.py -> build/lib.linux-i686-2.6/desktopcouch
copying desktopcouch/service.py -> build/lib.linux-i686-2.6/desktopcouch
creating build/lib.linux-i686-2.6/desktopcouch/tests
copying desktopcouch/tests/test_start_local_couchdb.py -> build/lib.linux-i686-2.6/desktopcouch/tests
copying desktopcouch/tests/test_service.py -> build/lib.linux-i686-2.6/desktopcouch/tests
copying desktopcouch/tests/test_local_files.py -> build/lib.linux-i686-2.6/desktopcouch/tests
copying desktopcouch/tests/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/tests
copying desktopcouch/tests/test_replication.py -> build/lib.linux-i686-2.6/desktopcouch/tests
creating build/lib.linux-i686-2.6/desktopcouch/tasks
copying desktopcouch/tasks/record.py -> build/lib.linux-i686-2.6/desktopcouch/tasks
copying desktopcouch/tasks/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/tasks
creating build/lib.linux-i686-2.6/desktopcouch/pair
copying desktopcouch/pair/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/pair
creating build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/field_registry.py -> build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/record.py -> build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/server.py -> build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/couchgrid.py -> build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/server_base.py -> build/lib.linux-i686-2.6/desktopcouch/records
creating build/lib.linux-i686-2.6/desktopcouch/replication_services
copying desktopcouch/replication_services/ubuntuone.py -> build/lib.linux-i686-2.6/desktopcouch/replication_services
copying desktopcouch/replication_services/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/replication_services
copying desktopcouch/replication_services/example.py -> build/lib.linux-i686-2.6/desktopcouch/replication_services
creating build/lib.linux-i686-2.6/desktopcouch/notes
copying desktopcouch/notes/record.py -> build/lib.linux-i686-2.6/desktopcouch/notes
copying desktopcouch/notes/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/notes
creating build/lib.linux-i686-2.6/desktopcouch/bookmarks
copying desktopcouch/bookmarks/record.py -> build/lib.linux-i686-2.6/desktopcouch/bookmarks
copying desktopcouch/bookmarks/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/bookmarks
creating build/lib.linux-i686-2.6/desktopcouch/contacts
copying desktopcouch/contacts/record.py -> build/lib.linux-i686-2.6/desktopcouch/contacts
copying desktopcouch/contacts/view.py -> build/lib.linux-i686-2.6/desktopcouch/contacts
copying desktopcouch/contacts/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/contacts
creating build/lib.linux-i686-2.6/desktopcouch/tasks/tests
copying desktopcouch/tasks/tests/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/tasks/tests
copying desktopcouch/tasks/tests/test_record.py -> build/lib.linux-i686-2.6/desktopcouch/tasks/tests
creating build/lib.linux-i686-2.6/desktopcouch/pair/tests
copying desktopcouch/pair/tests/test_couchdb_io.py -> build/lib.linux-i686-2.6/desktopcouch/pair/tests
copying desktopcouch/pair/tests/test_ubuntuone_pairing.py -> build/lib.linux-i686-2.6/desktopcouch/pair/tests
copying desktopcouch/pair/tests/test_network_io.py -> build/lib.linux-i686-2.6/desktopcouch/pair/tests
copying desktopcouch/pair/tests/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/pair/tests
creating build/lib.linux-i686-2.6/desktopcouch/pair/couchdb_pairing
copying desktopcouch/pair/couchdb_pairing/dbus_io.py -> build/lib.linux-i686-2.6/desktopcouch/pair/couchdb_pairing
copying desktopcouch/pair/couchdb_pairing/network_io.py -> build/lib.linux-i686-2.6/desktopcouch/pair/couchdb_pairing
copying desktopcouch/pair/couchdb_pairing/couchdb_io.py -> build/lib.linux-i686-2.6/desktopcouch/pair/couchdb_pairing
copying desktopcouch/pair/couchdb_pairing/ubuntuone_pairing.py -> build/lib.linux-i686-2.6/desktopcouch/pair/couchdb_pairing
copying desktopcouch/pair/couchdb_pairing/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/pair/couchdb_pairing
creating build/lib.linux-i686-2.6/desktopcouch/records/tests
copying desktopcouch/records/tests/test_field_registry.py -> build/lib.linux-i686-2.6/desktopcouch/records/tests
copying desktopcouch/records/tests/test_server.py -> build/lib.linux-i686-2.6/desktopcouch/records/tests
copying desktopcouch/records/tests/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/records/tests
copying desktopcouch/records/tests/test_record.py -> build/lib.linux-i686-2.6/desktopcouch/records/tests
creating build/lib.linux-i686-2.6/desktopcouch/notes/tests
copying desktopcouch/notes/tests/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/notes/tests
copying desktopcouch/notes/tests/test_record.py -> build/lib.linux-i686-2.6/desktopcouch/notes/tests
creating build/lib.linux-i686-2.6/desktopcouch/bookmarks/tests
copying desktopcouch/bookmarks/tests/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/bookmarks/tests
copying desktopcouch/bookmarks/tests/test_record.py -> build/lib.linux-i686-2.6/desktopcouch/bookmarks/tests
creating build/lib.linux-i686-2.6/desktopcouch/contacts/tests
copying desktopcouch/contacts/tests/test_create.py -> build/lib.linux-i686-2.6/desktopcouch/contacts/tests
copying desktopcouch/contacts/tests/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/contacts/tests
copying desktopcouch/contacts/tests/test_record.py -> build/lib.linux-i686-2.6/desktopcouch/contacts/tests
copying desktopcouch/contacts/tests/test_view.py -> build/lib.linux-i686-2.6/desktopcouch/contacts/tests
creating build/lib.linux-i686-2.6/desktopcouch/contacts/testing
copying desktopcouch/contacts/testing/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/contacts/testing
copying desktopcouch/contacts/testing/create.py -> build/lib.linux-i686-2.6/desktopcouch/contacts/testing
running build_scripts
creating build/scripts-2.6
copying and adjusting bin/desktopcouch-pair -> build/scripts-2.6
changing mode of build/scripts-2.6/desktopcouch-pair from 644 to 755
running build_i18n
intltool-update -p -g desktopcouch
intltool-merge -d po desktopcouch-pair.desktop.in build/share/applications/desktopcouch-pair.desktop
Merging translations into build/share/applications/desktopcouch-pair.desktop.
running build_icons
running clean
Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpCFtFX3/data/couchdb.html
desktopcouch.bookmarks.tests.test_record
  TestBookmarkRecord
    test_bookmark_record ...                                               [OK]
  TestFeedRecord
    test_feed_record ...                                                   [OK]
  TestFolderRecord
    test_folder_record ...                                                 [OK]
  TestSeparatorRecord
    test_separator_record ...                                              [OK]
desktopcouch.contacts.tests.test_create
  TestCreate
    test_create_many_contacts ...                                          [OK]
    test_head_or_tails ...                                                 [OK]
    test_random_bools ...                                                  [OK]
desktopcouch.contacts.tests.test_record
  TestContactRecord
    test_contact_record ...                                                [OK]
desktopcouch.contacts.tests.test_view
  TestLocalFiles
    test_find_contact_starting ...                                       [FAIL]
    test_find_contacts_exact ...                                           [OK]
desktopcouch.notes.tests.test_record
  TestNoteRecord
    test_note_record ...                                                   [OK]
desktopcouch.pair.tests.test_couchdb_io
  TestCouchdbIo
    test_get_database_names_replicatable ...                               [OK]
    test_get_database_names_replicatable_bad_server ...                    [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.pair.tests.test_network_io
  TestNetworkIO
    test_successful_lifespan ...                                           [OK]
desktopcouch.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.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_run_doctests ...                                                  [OK]
    test_to_app ...                                                        [OK]
desktopcouch.records.tests.test_record
  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_append ...                                         [OK]
    test_mergeable_list_append_record_dict ...                             [OK]
    test_mergeable_list_del ...                                            [OK]
    test_mergeable_list_index ...                                          [OK]
    test_mergeable_list_pop_correct_index ...                              [OK]
    test_mergeable_list_pop_last ...                                       [OK]
    test_mergeable_list_pop_wrong_index ...                                [OK]
    test_mergeable_list_remove ...                                         [OK]
    test_mergeable_list_remove_last ...                                    [OK]
    test_mergeable_list_remove_list ...                                    [OK]
    test_mergeable_list_remove_missing ...                                 [OK]
    test_mergeable_list_remove_record_dict ...                             [OK]
    test_mergeable_list_remove_tuple ...                                   [OK]
    test_mergeable_list_set_value_in_list_item ...                         [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_tuple ...                                                         [OK]
    test_uuid_like_keys ...                                                [OK]
    test_validate ...                                                      [OK]
desktopcouch.records.tests.test_server
  TestCouchDatabase
    test_attachments ...                                                   [OK]
    test_database_not_exists ...                                           [OK]
    test_delete_and_recreate_record ...                                    [OK]
    test_delete_record ...                                                 [OK]
    test_func_get_records ...                                              [OK]
    test_get_changes ...                                                   [OK]
    test_get_deleted_record ...                                            [OK]
    test_get_deleted_record_not_hidden ...                                 [OK]
    test_get_record ...                                                    [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]
    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.tasks.tests.test_record
  TestTaskRecord
    test_task_record ...                                                   [OK]
desktopcouch.tests.test_local_files
  TestKeyringIntegration
    test_admin_creds_already_present ...                                   [OK]
    test_admin_creds_saved ...                                             [OK]
    test_no_keyring_present ...                                            [OK]
    test_no_keyring_wanted ...                                             [OK]
  TestLocalFiles
    test_all_files_returned ...                                            [OK]
    test_bind_address ...                                                  [OK]
    test_couch_chain_ini_files ...                                         [OK]
    test_xdg_overwrite_works ...                                           [OK]
desktopcouch.tests.test_replication
  TestReplication
    test_creation ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpH6FrDH/data/couchdb.html
                                                     [OK]
  TestUbuntuoneReplication
    test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpK_OtSN/data/couchdb.html
                                                    [OK]
desktopcouch.tests.test_service
  TestService
    test_start_desktopcouch_replication ...                                [OK]
    test_start_new_desktopcouch ...                                        [OK]
desktopcouch.tests.test_start_local_couchdb
  TestUpdateDesignDocuments
    test_create_databases_and_design_docs ...                              [OK]
    test_pair_ubuntuone_with_sso ...                                       [OK]
    test_pair_ubuntuone_without_sso ...                                    [OK]

===============================================================================
[FAIL]: desktopcouch.contacts.tests.test_view.TestLocalFiles.test_find_contact_starting

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 128, in _run_user
    return fn(*args)
  File "/usr/lib/python2.6/dist-packages/testtools/testcase.py", line 368, in _run_test_method
    testMethod()
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/contacts/tests/test_view.py", line 128, in test_find_contact_starting
    self.assertEqual(len(contacts), 1)
AssertionError: 2 != 1
------------

-------------------------------------------------------------------------------
Ran 106 tests in 22.937s

FAILED (failures=1, successes=105)
Apache CouchDB has been shutdown.
Apache CouchDB has been shutdown.
Apache CouchDB has been shutdown.

/var/cache/tarmac/desktopcouch/trunk/desktopcouch/tests/__init__.py:10: Warning: g_set_application_name() called multiple times
  gobject.set_application_name("desktopcouch testing")
/usr/lib/pymodules/python2.6/gtk-2.0/gtk/__init__.py:57: GtkWarning: could not open display
  warnings.warn(str(e), _gtk.Warning)
DEBUG:root:starting dbus main loop
DEBUG:root:ending dbus main loop
INFO:root:exiting.
WARNING:root:shutting down personal couchdb.
dbus 2010-11-01 18:48:47,599 - shutting down personal couchdb.
INFO:root:Ubuntu SSO dbus service could not be used.

Revision history for this message

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

#

This is a fickle and unrelated test failure. We are going to remove or fix that test, but not in this branch.

desktopcouch

Merge lp://qastaging/~mandel/desktopcouch/remove_quickly into lp://qastaging/desktopcouch

Commit message

Description of the change

Preview Diff

Subscribers