Merge lp:~cmiller/desktopcouch/release-1.0.5 into lp:desktopcouch

[Chad Miller]

Release 1.0.5.

[dobey (dobey)]

review: Approve

[Eric Casteleijn (thisfred)]

+1 yo

review: Approve

[dobey (dobey)]

The attempt to merge lp:~cmiller/desktopcouch/release-1.0.5 into lp:desktopcouch failed. Below is the output from the failed tests.

+ u1trial -c desktopcouch
Traceback (most recent call last):
  File "/usr/bin/u1trial", line 226, in <module>
    main()
  File "/usr/bin/u1trial", line 223, in main
    TestRunner().run(testpath, options)
  File "/usr/bin/u1trial", line 166, in run
    suite = self._collect_tests(path, options.test, options.ignored)
  File "/usr/bin/u1trial", line 146, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/bin/u1trial", line 82, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/application/pair/tests/test_network_io.py", line 32, in <module>
    LOCAL_HOSTNAME = ".".join(get_local_hostname())
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/application/pair/couchdb_pairing/dbus_io.py", line 34, in get_local_hostname
    _, server = get_dbus_bus_server()
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/application/pair/couchdb_pairing/dbus_io.py", line 54, in get_dbus_bus_server
    root_name = bus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER)
  File "/usr/lib/pymodules/python2.7/dbus/bus.py", line 244, in get_object
    follow_name_owner_changes=follow_name_owner_changes)
  File "/usr/lib/pymodules/python2.7/dbus/proxies.py", line 241, in __init__
    self._named_service = conn.activate_name_owner(bus_name)
  File "/usr/lib/pymodules/python2.7/dbus/bus.py", line 183, in activate_name_owner
    self.start_service_by_name(bus_name)
  File "/usr/lib/pymodules/python2.7/dbus/bus.py", line 281, in start_service_by_name
    'su', (bus_name, flags)))
  File "/usr/lib/pymodules/python2.7/dbus/connection.py", line 630, in call_blocking
    message, timeout)
dbus.exceptions.DBusException: org.freedesktop.DBus.Error.Spawn.FileInvalid: Cannot do system-bus activation with no user

[dobey (dobey)]

The attempt to merge lp:~cmiller/desktopcouch/release-1.0.5 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/tmpgol5J2/data/couchdb.html
desktopcouch.application.pair.tests.test_network_io
  TestNetworkIO
    test_successful_lifespan ... [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.migration.tests.test_migration
  TestMigration
    test_migration_deleted_flag_to_trash ... [OK]
    test_migration_in_face_of_broken_records ... [OK]
    test_migration_script_is_run ... [OK]
    test_migration_script_is_run_and_can_access_view ... [OK]
  TestRegistration
    test_register_migration_is_added_to_the_registry ... [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_start_local_couchdb
  TestUpdateDesignDocuments
    test_create_databases_and_design_docs ... [OK]
desktopcouch.application.tests.test_service
  TestService
    test_start_desktopcouch_replication ... [OK]
    test_start_migrate_data ... [OK]
    test_start_new_desktopcouch_extensions ... [OK]
    test_start_new_desktopcouch_no_extensions ... [OK]
desktopcouch.application.tests.test_replication
  TestReplication
    test_creation ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmp89_1cw/data/couchdb.html
                                                     [OK]
  TestUbuntuoneReplication
    test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpk4ho4i/data/couchdb.html
                                                    [OK]
desktopcouch.application.platform.linux.tests.test_keyring
  TestGnomeKeyring
    test_get_aouth_no_keyring ... [OK]
    test_get_oa...

=== modified file 'setup.py'
--- setup.py	2010-12-23 17:06:58 +0000
+++ setup.py	2011-01-10 22:29:26 +0000
@@ -22,7 +22,7 @@
 
 setup(
     name='desktopcouch',
-    version='1.0.3',
+    version='1.0.5',
     description='A Desktop CouchDB instance.',
     url='https://launchpad.net/desktopcouch',
     license='LGPL-3',