desktopcouch

Merge lp://qastaging/~thisfred/desktopcouch/cut-gordian-knot into lp://qastaging/desktopcouch

  1. cut-gordian-knot
  2. Merge into trunk
Proposed by Eric Casteleijn
Status: Merged
Approved by: Eric Casteleijn
Approved revision: 224
Merged at revision: 224
Proposed branch: lp://qastaging/~thisfred/desktopcouch/cut-gordian-knot
Merge into: lp://qastaging/desktopcouch
Diff against target: 1052 lines (+229/-184)
30 files modified
bin/desktopcouch-pair (+2/-2)
desktopcouch/application/migration/__init__.py (+7/-7)
desktopcouch/application/migration/tests/test_migration.py (+11/-10)
desktopcouch/application/pair/couchdb_pairing/couchdb_io.py (+6/-6)
desktopcouch/application/pair/couchdb_pairing/ubuntuone_pairing.py (+2/-2)
desktopcouch/application/pair/tests/test_couchdb_io.py (+4/-4)
desktopcouch/application/platform/linux/__init__.py (+1/-1)
desktopcouch/application/platform/windows/__init__.py (+1/-1)
desktopcouch/application/replication_services/ubuntuone.py (+3/-3)
desktopcouch/application/server.py (+48/-50)
desktopcouch/application/service.py (+7/-12)
desktopcouch/application/start_local_couchdb.py (+2/-2)
desktopcouch/application/tests/test_replication.py (+4/-4)
desktopcouch/application/tests/test_start_local_couchdb.py (+3/-2)
desktopcouch/records/database.py (+40/-8)
desktopcouch/records/doc/records.txt (+2/-2)
desktopcouch/records/server.py (+9/-0)
desktopcouch/records/server_base.py (+9/-0)
desktopcouch/records/tests/__init__.py (+1/-2)
desktopcouch/records/tests/test_record.py (+3/-3)
desktopcouch/records/tests/test_server.py (+12/-13)
desktopcouch/recordtypes/contacts/__init__.py (+0/-1)
desktopcouch/recordtypes/contacts/testing/create.py (+2/-2)
desktopcouch/recordtypes/contacts/tests/test_record.py (+1/-1)
desktopcouch/recordtypes/contacts/tests/test_view.py (+2/-2)
desktopcouch/recordtypes/contacts/view.py (+42/-37)
desktopcouch/recordtypes/notes.py (+1/-0)
desktopcouch/recordtypes/tasks.py (+1/-1)
desktopcouch/recordtypes/tests/test_notes.py (+2/-5)
desktopcouch/recordtypes/tests/test_tasks.py (+1/-1)
To merge this branch: bzr merge lp://qastaging/~thisfred/desktopcouch/cut-gordian-knot
Reviewer Review Type Date Requested Status
Chad Miller (community) Approve
Vincenzo Di Somma (community) Approve
Review via email: mp+41643@code.qastaging.launchpad.net

Commit message

This cuts out all the dependencies on desktopcouch.application from desktopcouch.records.

Description of the change

This cuts out all the dependencies on desktopcouch.application from desktopcouch.records.

The tests still depend on it, because we need it to start and stop the test couchdb instance, and there is one deprecated class that imports from application, since I did not want to break bw compatibility. People who use desktopcouch.records as a library should simply switch to non-deprecated API.

To post a comment you must log in.
Revision history for this message
Vincenzo Di Somma (vds) :
review: Approve
Revision history for this message
Chad Miller (cmiller) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (29.6 KiB)

The attempt to merge lp:~thisfred/desktopcouch/cut-gordian-knot 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/tmp_aNB1V/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/tmpJFAsvR/data/couchdb.html
                                                     [OK]
  TestUbuntuoneReplication
    test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpBXpLld/data/couchdb.html
                                                    [OK]
desktopcouch.application.migration.tests.test_migration
  TestMigration
    test_migration_script_is_run ... [OK]
    test_migration_script_is_run_and_can_access_view ... [OK]
  TestRegistration
    test_register_migration_add_view_to_a_given_db ... [OK]
    test_register_migration_add_view_to_all_the_dbs ... [OK]
    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 ... [...

Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches