desktopcouch

Merge lp://qastaging/~thisfred/desktopcouch/my-use-devtools into lp://qastaging/desktopcouch

  1. my-use-devtools
  2. Merge into trunk
Proposed by Eric Casteleijn
Status: Merged
Approved by: dobey
Approved revision: 230
Merged at revision: 217
Proposed branch: lp://qastaging/~thisfred/desktopcouch/my-use-devtools
Merge into: lp://qastaging/desktopcouch
Diff against target: 2237 lines (+499/-433)
39 files modified
bin/desktopcouch-get-port (+12/-12)
bin/desktopcouch-pair (+154/-151)
bin/desktopcouch-service (+5/-3)
bin/desktopcouch-stop (+4/-1)
desktopcouch/application/__init__.py (+1/-0)
desktopcouch/application/local_files.py (+5/-5)
desktopcouch/application/migration/__init__.py (+5/-1)
desktopcouch/application/pair/__init__.py (+6/-1)
desktopcouch/application/pair/couchdb_pairing/couchdb_io.py (+7/-6)
desktopcouch/application/pair/couchdb_pairing/dbus_io.py (+7/-7)
desktopcouch/application/pair/couchdb_pairing/network_io.py (+60/-50)
desktopcouch/application/pair/couchdb_pairing/ubuntuone_pairing.py (+2/-2)
desktopcouch/application/pair/tests/test_couchdb_io.py (+13/-27)
desktopcouch/application/pair/tests/test_network_io.py (+4/-4)
desktopcouch/application/pair/tests/test_ubuntuone_pairing.py (+8/-3)
desktopcouch/application/platform/__init__.py (+4/-0)
desktopcouch/application/platform/linux/__init__.py (+7/-6)
desktopcouch/application/platform/linux/ipc.py (+9/-7)
desktopcouch/application/platform/linux/keyring.py (+3/-2)
desktopcouch/application/platform/windows/__init__.py (+5/-2)
desktopcouch/application/replication.py (+18/-15)
desktopcouch/application/replication_services/__init__.py (+3/-2)
desktopcouch/application/replication_services/example.py (+12/-3)
desktopcouch/application/start_local_couchdb.py (+7/-3)
desktopcouch/application/util.py (+3/-2)
desktopcouch/records/__init__.py (+7/-6)
desktopcouch/records/field_registry.py (+2/-2)
desktopcouch/records/server_base.py (+20/-17)
desktopcouch/records/tests/test_field_registry.py (+6/-5)
desktopcouch/records/tests/test_server.py (+23/-9)
desktopcouch/recordtypes/contacts/tests/__init__.py (+1/-2)
desktopcouch/recordtypes/contacts/tests/test_create.py (+7/-7)
desktopcouch/recordtypes/contacts/tests/test_view.py (+9/-5)
desktopcouch/recordtypes/contacts/view.py (+2/-2)
desktopcouch/recordtypes/tests/test_bookmarks.py (+7/-4)
run-tests (+21/-0)
run-tests-with-coverage (+24/-0)
runtests.py (+0/-52)
setup.py (+6/-7)
To merge this branch: bzr merge lp://qastaging/~thisfred/desktopcouch/my-use-devtools
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
dobey (community) Approve
Review via email: mp+41497@code.qastaging.launchpad.net

Commit message

This makes desktopcouch use the ubuntuone-dev-tools for testing and lint/pep8 checking. It will enforce lintless code.

Description of the change

This makes desktopcouch use the ubuntuone-dev-tools for testing and lint/pep8 checking. It will enforce lintless code.

To post a comment you must log in.
Revision history for this message
Eric Casteleijn (thisfred) wrote :

This is Rodney's branch, with the #u1lint uncommented, and *all* the ensuing lint issues resolved.

Revision history for this message
Eric Casteleijn (thisfred) wrote :

Note that I pylint escaped a lot of things I did not know enough to really fix. I did add FIXME's there, for those who do.

Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

VERY GOOD!

review: Approve
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.

Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (11.3 KiB)

The attempt to merge lp:~thisfred/desktopcouch/my-use-devtools 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/util.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/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/tests
creating build/lib.linux-i686-2.6/desktopcouch/application
copying desktopcouch/application/stop_local_couchdb.py -> build/lib.linux-i686-2.6/desktopcouch/application
copying desktopcouch/application/start_local_couchdb.py -> build/lib.linux-i686-2.6/desktopcouch/application
copying desktopcouch/application/util.py -> build/lib.linux-i686-2.6/desktopcouch/application
copying desktopcouch/application/replication.py -> build/lib.linux-i686-2.6/desktopcouch/application
copying desktopcouch/application/local_files.py -> build/lib.linux-i686-2.6/desktopcouch/application
copying desktopcouch/application/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/application
copying desktopcouch/application/service.py -> build/lib.linux-i686-2.6/desktopcouch/application
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/server.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/recordtypes
copying desk...

Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (11.3 KiB)

The attempt to merge lp:~thisfred/desktopcouch/my-use-devtools 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/util.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/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/tests
creating build/lib.linux-i686-2.6/desktopcouch/application
copying desktopcouch/application/stop_local_couchdb.py -> build/lib.linux-i686-2.6/desktopcouch/application
copying desktopcouch/application/start_local_couchdb.py -> build/lib.linux-i686-2.6/desktopcouch/application
copying desktopcouch/application/util.py -> build/lib.linux-i686-2.6/desktopcouch/application
copying desktopcouch/application/replication.py -> build/lib.linux-i686-2.6/desktopcouch/application
copying desktopcouch/application/local_files.py -> build/lib.linux-i686-2.6/desktopcouch/application
copying desktopcouch/application/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/application
copying desktopcouch/application/service.py -> build/lib.linux-i686-2.6/desktopcouch/application
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/server.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/recordtypes
copying desk...

Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (22.3 KiB)

The attempt to merge lp:~thisfred/desktopcouch/my-use-devtools 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/tmpUpYew9/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/tmp6RXCK5/data/couchdb.html
                                                     [OK]
  TestUbuntuoneReplication
    test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpnSxdJ8/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 ... [O...

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