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

Proposed by Manuel de la Peña
Status: Merged
Approved by: Manuel de la Peña
Approved revision: 196
Merged at revision: 243
Proposed branch: lp://qastaging/~mandel/desktopcouch/improve_keyring_tests
Merge into: lp://qastaging/desktopcouch
Prerequisite: lp://qastaging/~mandel/desktopcouch/move_xdg_to_platform
Diff against target: 204 lines (+194/-0)
2 files modified
desktopcouch/application/platform/linux/tests/__init__.py (+1/-0)
desktopcouch/application/platform/linux/tests/test_keyring.py (+193/-0)
To merge this branch: bzr merge lp://qastaging/~mandel/desktopcouch/improve_keyring_tests
Reviewer Review Type Date Requested Status
Vincenzo Di Somma (community) Approve
Eric Casteleijn (community) Approve
Review via email: mp+39800@code.qastaging.launchpad.net

Commit message

Increase the test coverage of the Keyring class that uses gnomekeyring as its backend.

Description of the change

Increase the test coverage of the Keyring class that uses gnomekeyring as its backed.

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

The amount of awesome is overwhelming today.

review: Approve
Revision history for this message
Vincenzo Di Somma (vds) :
review: Approve
Revision history for this message
dobey (dobey) wrote :

The prerequisite lp:~mandel/desktopcouch/move_xdg_to_platform has not yet been merged into lp:desktopcouch.

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

Attempt to merge into lp:desktopcouch failed due to conflicts:

text conflict in desktopcouch/application/platform/linux/keyring.py

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

The attempt to merge lp:~mandel/desktopcouch/improve_keyring_tests 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/tmpDLcJxq/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/tmpPj_Wtg/data/couchdb.html
                                                     [OK]
  TestUbuntuoneReplication
    test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpZo6fyl/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.linux.tests.test_keyring
  TestGnomeKeyring
    test_get_aouth_no_keyring ... Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 311, in run
    self.setUp()
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/application/platform/linux/tests/test_keyring.py", line 33, in setUp
    keyring=self._gnomekeyring)
exceptions.TypeError: __init__() got an unexpected keyword argument 'make_random_string'
[ERROR]
    test_get_oauth_canceled_store ... Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 311, in run
    self.setUp()
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/application/platform/linux/tests/test_keyring.py", line 33, in setUp
    keyring=self._gnomekeyring)
exceptions.TypeError: __init__() got an unexpected keyword argument 'make_random_string'
[ERROR]
    test_...

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

The attempt to merge lp:~mandel/desktopcouch/improve_keyring_tests 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/tmp1lBCOH/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/tmpnrtXSs/data/couchdb.html
                                                     [OK]
  TestUbuntuoneReplication
    test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmp69ks0D/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.linux.tests.test_keyring
  TestGnomeKeyring
    test_get_aouth_no_keyring ... [OK]
    test_get_oauth_canceled_store ... [OK]
    test_get_oauth_data_stored ... [OK]
    test_get_user_name_password_keyring ... [OK]
    test_get_user_name_password_no_daemon ... [OK]
    test_get_user_name_password_not_in_keyring ... [OK]
    test_get_user_name_password_user_cancel ... [OK]
desktopcouch.application.platform.windows.tests.test_keyring
  TestKeyring
    test_get_oauth_data ... [OK]
    test_get_user_name_password ... [OK]
    test_get_user_name_passw...

196. By Manuel de la Peña

Merged with trunk, fixed lint and pep8 warnings.

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