Merge lp:~jderose/desktopcouch/uri_file-fix into lp:desktopcouch

[Jason Gerard DeRose]

Add 'uri_file =' in [couchdb] config section for CouchDB 1.1.1 compatibility

This one line change results in something like this being included in the couchdb config written by desktopcouch:

[couchdb]
uri_file =

It is needed for CouchDB 1.1.1 compatabliity, otherwise CouchDB will try and write couch.uri file in /var/run/couchdb

[dobey (dobey)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~jderose/desktopcouch/uri_file-fix 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 325, in <module>
    main()
  File "/usr/bin/u1trial", line 305, in main
    suite = trial_runner.get_suite(config)
  File "/usr/bin/u1trial", line 184, in get_suite
    config['ignore-paths']))
  File "/usr/bin/u1trial", line 168, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/bin/u1trial", line 108, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/mnt/tarmac/cache/desktopcouch/trunk/desktopcouch/application/platform/__init__.py", line 20, in <module>
    from desktopcouch.application.platform.linux.keyring import (
  File "/mnt/tarmac/cache/desktopcouch/trunk/desktopcouch/application/platform/linux/keyring.py", line 21, in <module>
    import gnomekeyring
ImportError: No module named gnomekeyring

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~jderose/desktopcouch/uri_file-fix 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 325, in <module>
    main()
  File "/usr/bin/u1trial", line 305, in main
    suite = trial_runner.get_suite(config)
  File "/usr/bin/u1trial", line 184, in get_suite
    config['ignore-paths']))
  File "/usr/bin/u1trial", line 168, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/bin/u1trial", line 108, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/mnt/tarmac/cache/desktopcouch/trunk/desktopcouch/application/migration/__init__.py", line 28, in <module>
    from desktopcouch.records import database
  File "/mnt/tarmac/cache/desktopcouch/trunk/desktopcouch/records/database.py", line 45, in <module>
    from couchdb import Server
ImportError: No module named couchdb

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~jderose/desktopcouch/uri_file-fix 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/tmpT6lXME/data/couchdb.html
desktopcouch.application.platform.windows.tests.test_base_dirs
  BaseDirsTestCase
    test_get_special_folders ... [OK]
    test_get_special_folders_cannot_get_data ... [OK]
    test_get_special_folders_cannot_open_hive ... [OK]
    test_get_special_folders_cannot_open_key ... [OK]
desktopcouch.application.platform.windows.tests.test_keyring
  TestKeyring
    test_get_oauth_data ... [OK]
    test_get_user_name_password ... [OK]
    test_get_user_name_password_no_key ... [OK]
    test_get_user_name_password_no_value ... [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.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.plugins.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]
  TestUbuntuOnePlugin
    test_got_new_credentials ... [OK]
    test_got_new_credentials_other ... [OK]
    test_listen_to_dbus ... [OK]
desktopcouch.application.plugins.tests.test_plugins
  TestLoadPlugins
    test_load_plugins ... [OK]
desktopcouch.application.tests.test_start_local_couchdb
  TestUpdateDesignDocuments
    test_create_databases_and_design_docs ... [OK]
desktopcouch.application.tests.test_service
  Te...

=== modified file 'config/desktop-couch/default.ini'
--- config/desktop-couch/default.ini	2010-11-01 22:06:34 +0000
+++ config/desktop-couch/default.ini	2011-12-27 04:05:27 +0000
@@ -1,3 +1,5 @@
 [replicator]
 max_http_sessions = 1
 
+[couchdb]
+uri_file =