Merge lp:~pedronis/desktopcouch/trying-with-an-other-couchdb into lp:desktopcouch

[Samuele Pedroni]

introduce COUCHDB_INI to control the default.ini when supplying a couchdb exe with COUCH; tiny error logging fix

tiny fix, when using COUCHDB to specify a different couch than the system there's a need to point to it's default.ini as well (it contains some location specific paths etc)

[Eric Casteleijn (thisfred)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~pedronis/desktopcouch/trying-with-an-other-couchdb 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/tmp6Ijhem/data/couchdb.html
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.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.tests.test_service
  TestService
    test_start_desktopcouch_replication ... [OK]
    test_start_migrate_data ... [OK]
    test_start_new_desktopcouch_with_plugins ... [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
  TestUpda...

[lp:~pedronis/desktopcouch/trying-with-an-other-couchdb]

282. By Samuele Pedroni on 2011-08-22

fix line too long

=== modified file 'desktopcouch/application/local_files.py'
--- desktopcouch/application/local_files.py	2011-04-13 21:31:15 +0000
+++ desktopcouch/application/local_files.py	2011-08-22 12:40:26 +0000
@@ -259,7 +259,8 @@
     def couch_chain_ini_files(self):
         """Chain couchdb ini files."""
         # Explicitly add default ini file
-        ini_files = ["/etc/couchdb/default.ini"]
+        ini_files = [os.environ.get("COUCHDB_INI") or
+                     "/etc/couchdb/default.ini"]
 
         # find all ini files in the desktopcouch XDG_CONFIG_DIRS and
         # add them to the chain

=== modified file 'desktopcouch/application/start_local_couchdb.py'
--- desktopcouch/application/start_local_couchdb.py	2011-04-06 18:34:35 +0000
+++ desktopcouch/application/start_local_couchdb.py	2011-08-22 12:40:26 +0000
@@ -166,7 +166,7 @@
             break
         except RuntimeError, ex:
             saved_exception = ex
-            logging.exception("Starting couchdb failed on try %d", (retry,))
+            logging.exception("Starting couchdb failed on try %d", retry)
             time.sleep(1)
             continue