Merge into trunk : default-context-gets-keyringclass-instance : Code : desktopcouch

Status:	Merged
Approved by:	dobey on 2010-11-09
Approved revision:	203
Merged at revision:	201
Proposed branch:	lp://qastaging/~cmiller/desktopcouch/default-context-gets-keyringclass-instance
Merge into:	lp://qastaging/desktopcouch
Diff against target:	44 lines (+7/-2) 2 files modified desktopcouch/local_files.py (+1/-1) desktopcouch/platform/linux/keyring.py (+6/-1)
To merge this branch:	bzr merge lp://qastaging/~cmiller/desktopcouch/default-context-gets-keyringclass-instance
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
dobey (community)		Approve on 2010-11-08
Eric Casteleijn (community)	2010-11-08	Approve on 2010-11-08
Review via email: mp+40358@code.qastaging.launchpad.net

Commit message

Get an instance of the Keyring object to pass around in the Context, not the class Keyring.

Additionally, catch and discard the kind of exception that signals that the keyring is not available, and make it return the default value.

Revision history for this message

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

#

I doubt it's due to this change, but I get this test-failure:

===============================================================================
[FAIL]: desktopcouch.pair.tests.test_couchdb_io.TestCouchdbIo.test_get_my_host_unique_id

Traceback (most recent call last):
File "/home/eric/canonical/desktopcouch/default-context-gets-keyringclass-instance/desktopcouch/pair/tests/test_couchdb_io.py", line 148, in test_get_my_host_unique_id
self.assertEquals(got, again)
twisted.trial.unittest.FailTest: not equal:
a = ['aa6717f4-464e-4188-97aa-65fe11710412']
b = ['eb094a86-18a7-4fd7-bd5f-6fc918c5d3ac']

-------------------------------------------------------------------------------

review: Abstain

Revision history for this message

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

#

Yeah, same on trunk, so this is fine.

review: Approve

Revision history for this message

dobey (dobey) on 2010-11-08:

#

review: Approve

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2010-11-08:

#

Download full text (8.9 KiB)

The attempt to merge lp:~cmiller/desktopcouch/default-context-gets-keyringclass-instance 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/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/platform
copying desktopcouch/platform/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/platform
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 -> buil...

The attempt to merge lp:~cmiller/desktopcouch/default-context-gets-keyringclass-instance 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/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/platform
copying desktopcouch/platform/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/platform
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/platform/linux
copying desktopcouch/platform/linux/ipc.py -> build/lib.linux-i686-2.6/desktopcouch/platform/linux
copying desktopcouch/platform/linux/keyring.py -> build/lib.linux-i686-2.6/desktopcouch/platform/linux
copying desktopcouch/platform/linux/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/platform/linux
creating build/lib.linux-i686-2.6/desktopcouch/platform/windows
copying desktopcouch/platform/windows/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/platform/windows
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

WARNING:root:There is no keyring to store our admin credentials.
WARNING:root:There is no keyring to store our admin credentials.
Traceback (most recent call last):
  File "./runtests.py", line 24, in <module>
    from desktopcouch.platform import set_application_name
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/platform/__init__.py", line 16, in <module>
    from desktopcouch.local_files import DEFAULT_CONTEXT
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/local_files.py", line 274, in <module>
    keyring=Keyring())
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/local_files.py", line 205, in __init__
    self.configuration = _Configuration(self)
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/local_files.py", line 131, in __init__
    self._fill_from_structure(local)
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/local_files.py", line 137, in _fill_from_structure
    self.set_item(section_name, key, structure[section_name][key])
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/local_files.py", line 162, in set_item
    self._c.set(section_name, key, value)
  File "/usr/lib/python2.6/ConfigParser.py", line 660, in set
    raise TypeError("option values must be strings")
TypeError: option values must be strings

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2010-11-08:

#

Download full text (22.3 KiB)

The attempt to merge lp:~cmiller/desktopcouch/default-context-gets-keyringclass-instance 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/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/platform
copying desktopcouch/platform/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/platform
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 -> buil...

The attempt to merge lp:~cmiller/desktopcouch/default-context-gets-keyringclass-instance 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/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/platform
copying desktopcouch/platform/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/platform
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/platform/linux
copying desktopcouch/platform/linux/ipc.py -> build/lib.linux-i686-2.6/desktopcouch/platform/linux
copying desktopcouch/platform/linux/keyring.py -> build/lib.linux-i686-2.6/desktopcouch/platform/linux
copying desktopcouch/platform/linux/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/platform/linux
creating build/lib.linux-i686-2.6/desktopcouch/platform/windows
copying desktopcouch/platform/windows/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/platform/windows
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/tmplA1KmS/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 ...                                         [OK]
    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 ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///home/otto/.local/share/desktop-couch/couchdb.html
                                      [FAIL]
    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 ...                                                [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_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_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]
  TestCouchDatabaseDeprecated
    test_func_get_records ... /var/cache/tarmac/desktopcouch/trunk/desktopcouch/records/server_base.py:509: DeprecationWarning: .get_records is deprecated, use .get_all_records instead
                                             [OK]
    test_get_records_by_record_type_save_view ... /var/cache/tarmac/desktopcouch/trunk/desktopcouch/records/server_base.py:509: DeprecationWarning: .get_records is deprecated, use .get_all_records instead
                         [OK]
    test_get_view_by_type_createxcl_fail ... /var/cache/tarmac/desktopcouch/trunk/desktopcouch/records/server_base.py:509: DeprecationWarning: .get_records is deprecated, use .get_all_records instead
                              [OK]
    test_get_view_by_type_new_but_already ... /var/cache/tarmac/desktopcouch/trunk/desktopcouch/records/server_base.py:509: DeprecationWarning: .get_records is deprecated, use .get_all_records instead
                             [OK]
desktopcouch.tasks.tests.test_record
  TestTaskRecord
    test_task_record ...                                                   [OK]
desktopcouch.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.tests.test_replication
  TestReplication
    test_creation ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpHfo1bL/data/couchdb.html
                                                     [OK]
  TestUbuntuoneReplication
    test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpQxvhxd/data/couchdb.html
                                                    [OK]
desktopcouch.tests.test_service
  TestService
    test_start_desktopcouch_replication ...                                [OK]
    test_start_new_desktopcouch_extensions ...                             [OK]
    test_start_new_desktopcouch_no_extensions ...                          [OK]
desktopcouch.tests.test_start_local_couchdb
  TestUpdateDesignDocuments
    test_create_databases_and_design_docs ...                              [OK]

===============================================================================
[FAIL]: desktopcouch.pair.tests.test_couchdb_io.TestCouchdbIo.test_get_my_host_unique_id

Traceback (most recent call last):
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/pair/tests/test_couchdb_io.py", line 148, in test_get_my_host_unique_id
    self.assertEquals(got, again)
twisted.trial.unittest.FailTest: not equal:
a = ['656f1e37-c20b-4fc4-b0f1-11dba56821bd']
b = ['1d0b891a-076c-4327-940f-1e8a3e3c83a8']

-------------------------------------------------------------------------------
Ran 105 tests in 26.988s

FAILED (failures=1, successes=104)

Pylint started!

Linting changed files:
  desktopcouch/local_files.py
  desktopcouch/platform/linux/keyring.py
  po/desktopcouch.pot

== Pylint notices ==
************* Module desktopcouch.local_files
C0301:293: Line too long (81/80)
W0402: 32: Uses of a deprecated module 'string'
F0401: 40: Unable to import 'configparser'
W0613: 51:_write_bookmark: Unused argument 'admin_password'
W0613: 51:_write_bookmark: Unused argument 'admin_username'
C0111: 67:_Configuration: Missing docstring
C0103: 71:_Configuration.__init__: Invalid name "_c" (should match [a-z_][a-z0-9_]{2,30}$)
C0323:104:_Configuration.__init__: Operator not followed by a space
            admin_username, admin_password =\
                                           ^
                ctx.keyring.get_user_name_password()
C0323:108:_Configuration.__init__: Operator not followed by a space
            consumer_key, consumer_secret, token, token_secret =\
                                                               ^
                ctx.keyring.get_oauth_data()
W0612: 80:_Configuration.__init__: Unused variable 'p'
W0612: 80:_Configuration.__init__: Unused variable 'u'
C0111:134:_Configuration._fill_from_structure: Missing docstring
C0111:139:_Configuration._fill_from_file: Missing docstring
C0111:143:_Configuration.save_to_file: Missing docstring
C0111:153:_Configuration.items_in_section: Missing docstring
C0111:159:_Configuration.set_item: Missing docstring
R0902:172:Context: Too many instance attributes (13/7)
C0111:207:Context.sanitize_log_files: Missing docstring
W6501:225:Context.sanitize_log_files: Specify string format arguments as logging function parameters
C0111:237:Context.couch_chain_ini_files: Missing docstring
W0621:252:Context.couch_chain_ini_files: Redefining name 'x' from outer scope (line 45)
W0612:241:Context.couch_chain_ini_files: Unused variable 'couchversion'
C0111:262:NoOAuthTokenException: Missing docstring
E1003:263:NoOAuthTokenException.__init__: Bad first argument 'Exception' given to super class
C0111:276:get_admin_credentials: Missing docstring
C0111:317:set_bind_address: Missing docstring
W0611: 32: Unused import string
W0611: 31: Unused import random
************* Module desktopcouch.platform.linux.keyring
C0301: 29: Line too long (84/80)
C0301: 38: Line too long (81/80)
C0301: 54: Line too long (83/80)
C0301: 56: Line too long (83/80)
C0301: 58: Line too long (83/80)
C0301: 68: Line too long (85/80)
C0111:  1: Missing docstring
W0621: 29:Keyring.__init__: Redefining name 'make_random_string' from outer scope (line 24)
W0613: 29:Keyring.__init__: Unused argument 'keyring'
W0611: 19: Unused import os
W0611: 22: Unused import xdg_base_dirs

Apache CouchDB has been shutdown.
Apache CouchDB has been shutdown.
Apache CouchDB has been shutdown.

WARNING:root:There is no keyring to store our admin credentials.
WARNING:root:There is no keyring to store our admin credentials.
/var/cache/tarmac/desktopcouch/trunk/desktopcouch/tests/__init__.py:10: Warning: g_set_application_name() called multiple times
  gobject.set_application_name("desktopcouch testing")
WARNING:root:Personal couchdb is already running at PID#32.
WARNING:root: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 2010-11-08 14:31:11,562 - shutting down personal couchdb.
WARNING:root:Starting up personal couchdb.
dbus 2010-11-08 14:31:11,564 - 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 2010-11-08 14:31:11,565 - shutting down personal couchdb.
dbus 2010-11-08 14:31:11,565 - shutting down personal couchdb.
No config file found, using default configuration

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2010-11-08:

#

Download full text (22.0 KiB)

The attempt to merge lp:~cmiller/desktopcouch/default-context-gets-keyringclass-instance 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/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/platform
copying desktopcouch/platform/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/platform
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 -> buil...

The attempt to merge lp:~cmiller/desktopcouch/default-context-gets-keyringclass-instance 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/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/platform
copying desktopcouch/platform/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/platform
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/platform/linux
copying desktopcouch/platform/linux/ipc.py -> build/lib.linux-i686-2.6/desktopcouch/platform/linux
copying desktopcouch/platform/linux/keyring.py -> build/lib.linux-i686-2.6/desktopcouch/platform/linux
copying desktopcouch/platform/linux/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/platform/linux
creating build/lib.linux-i686-2.6/desktopcouch/platform/windows
copying desktopcouch/platform/windows/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/platform/windows
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/tmpiV_Juw/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 ...                                         [OK]
    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 ...                                       [FAIL]
    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 ...                                                [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_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_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]
  TestCouchDatabaseDeprecated
    test_func_get_records ... /var/cache/tarmac/desktopcouch/trunk/desktopcouch/records/server_base.py:509: DeprecationWarning: .get_records is deprecated, use .get_all_records instead
                                             [OK]
    test_get_records_by_record_type_save_view ... /var/cache/tarmac/desktopcouch/trunk/desktopcouch/records/server_base.py:509: DeprecationWarning: .get_records is deprecated, use .get_all_records instead
                         [OK]
    test_get_view_by_type_createxcl_fail ... /var/cache/tarmac/desktopcouch/trunk/desktopcouch/records/server_base.py:509: DeprecationWarning: .get_records is deprecated, use .get_all_records instead
                              [OK]
    test_get_view_by_type_new_but_already ... /var/cache/tarmac/desktopcouch/trunk/desktopcouch/records/server_base.py:509: DeprecationWarning: .get_records is deprecated, use .get_all_records instead
                             [OK]
desktopcouch.tasks.tests.test_record
  TestTaskRecord
    test_task_record ...                                                   [OK]
desktopcouch.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.tests.test_replication
  TestReplication
    test_creation ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpdkWmcd/data/couchdb.html
                                                     [OK]
  TestUbuntuoneReplication
    test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpJgofKv/data/couchdb.html
                                                    [OK]
desktopcouch.tests.test_service
  TestService
    test_start_desktopcouch_replication ...                                [OK]
    test_start_new_desktopcouch_extensions ...                             [OK]
    test_start_new_desktopcouch_no_extensions ...                          [OK]
desktopcouch.tests.test_start_local_couchdb
  TestUpdateDesignDocuments
    test_create_databases_and_design_docs ...                              [OK]

===============================================================================
[FAIL]: desktopcouch.pair.tests.test_couchdb_io.TestCouchdbIo.test_get_my_host_unique_id

Traceback (most recent call last):
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/pair/tests/test_couchdb_io.py", line 148, in test_get_my_host_unique_id
    self.assertEquals(got, again)
twisted.trial.unittest.FailTest: not equal:
a = ['bb78241d-0bb4-4bbe-8217-a64346b6cb8f']
b = ['5432ceec-6de0-434d-96f5-374a79c320f1']

-------------------------------------------------------------------------------
Ran 105 tests in 30.804s

FAILED (failures=1, successes=104)

Pylint started!

Linting changed files:
  desktopcouch/local_files.py
  desktopcouch/platform/linux/keyring.py
  po/desktopcouch.pot

== Pylint notices ==
************* Module desktopcouch.local_files
C0301:293: Line too long (81/80)
W0402: 32: Uses of a deprecated module 'string'
F0401: 40: Unable to import 'configparser'
W0613: 51:_write_bookmark: Unused argument 'admin_password'
W0613: 51:_write_bookmark: Unused argument 'admin_username'
C0111: 67:_Configuration: Missing docstring
C0103: 71:_Configuration.__init__: Invalid name "_c" (should match [a-z_][a-z0-9_]{2,30}$)
C0323:104:_Configuration.__init__: Operator not followed by a space
            admin_username, admin_password =\
                                           ^
                ctx.keyring.get_user_name_password()
C0323:108:_Configuration.__init__: Operator not followed by a space
            consumer_key, consumer_secret, token, token_secret =\
                                                               ^
                ctx.keyring.get_oauth_data()
W0612: 80:_Configuration.__init__: Unused variable 'p'
W0612: 80:_Configuration.__init__: Unused variable 'u'
C0111:134:_Configuration._fill_from_structure: Missing docstring
C0111:139:_Configuration._fill_from_file: Missing docstring
C0111:143:_Configuration.save_to_file: Missing docstring
C0111:153:_Configuration.items_in_section: Missing docstring
C0111:159:_Configuration.set_item: Missing docstring
R0902:172:Context: Too many instance attributes (13/7)
C0111:207:Context.sanitize_log_files: Missing docstring
W6501:225:Context.sanitize_log_files: Specify string format arguments as logging function parameters
C0111:237:Context.couch_chain_ini_files: Missing docstring
W0621:252:Context.couch_chain_ini_files: Redefining name 'x' from outer scope (line 45)
W0612:241:Context.couch_chain_ini_files: Unused variable 'couchversion'
C0111:262:NoOAuthTokenException: Missing docstring
E1003:263:NoOAuthTokenException.__init__: Bad first argument 'Exception' given to super class
C0111:276:get_admin_credentials: Missing docstring
C0111:317:set_bind_address: Missing docstring
W0611: 32: Unused import string
W0611: 31: Unused import random
************* Module desktopcouch.platform.linux.keyring
C0301: 29: Line too long (84/80)
C0301: 38: Line too long (81/80)
C0301: 54: Line too long (83/80)
C0301: 56: Line too long (83/80)
C0301: 58: Line too long (83/80)
C0301: 68: Line too long (85/80)
C0111:  1: Missing docstring
W0621: 29:Keyring.__init__: Redefining name 'make_random_string' from outer scope (line 24)
W0613: 29:Keyring.__init__: Unused argument 'keyring'
W0611: 19: Unused import os
W0611: 22: Unused import xdg_base_dirs

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")
DEBUG:root:starting dbus main loop
DEBUG:root:ending dbus main loop
INFO:root:exiting.
WARNING:root:shutting down personal couchdb.
dbus 2010-11-08 16:31:33,544 - shutting down personal couchdb.
WARNING:root:Starting up personal couchdb.
dbus 2010-11-08 16:31:33,548 - 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 2010-11-08 16:31:33,549 - shutting down personal couchdb.
dbus 2010-11-08 16:31:33,549 - shutting down personal couchdb.
No config file found, using default configuration

desktopcouch

Merge lp://qastaging/~cmiller/desktopcouch/default-context-gets-keyringclass-instance into lp://qastaging/desktopcouch

Commit message

Description of the change

Preview Diff

Subscribers