Merge lp://staging/~pedronis/desktopcouch/trying-with-an-other-couchdb into lp://staging/desktopcouch
Proposed by
Samuele Pedroni
Status: | Merged |
---|---|
Approved by: | Samuele Pedroni |
Approved revision: | 282 |
Merged at revision: | 280 |
Proposed branch: | lp://staging/~pedronis/desktopcouch/trying-with-an-other-couchdb |
Merge into: | lp://staging/desktopcouch |
Diff against target: |
25 lines (+3/-2) 2 files modified
desktopcouch/application/local_files.py (+2/-1) desktopcouch/application/start_local_couchdb.py (+1/-1) |
To merge this branch: | bzr merge lp://staging/~pedronis/desktopcouch/trying-with-an-other-couchdb |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Eric Casteleijn (community) | Approve | ||
Review via email: mp+72260@code.staging.launchpad.net |
Commit message
introduce COUCHDB_INI to control the default.ini when supplying a couchdb exe with COUCH; tiny error logging fix
Description of the change
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)
To post a comment you must log in.
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. /tmp/tmp6Ijhem/ data/couchdb. html application. migration. tests.test_ migration migration_ deleted_ flag_to_ trash ... [OK] migration_ in_face_ of_broken_ records ... [OK] migration_ script_ is_run ... [OK] migration_ script_ is_run_ and_can_ access_ view ... [OK] register_ migration_ is_added_ to_the_ registry ... [OK] application. plugins. tests.test_ ubuntuone_ pairing airing pair_with_ ubuntuone_ no_record ... [OK] pair_with_ ubuntuone_ no_view ... [OK] pair_with_ ubuntuone_ record_ present ... [OK] pair_with_ ubuntuone_ user_deleted_ record ... [OK] Plugin got_new_ credentials ... [OK] got_new_ credentials_ other ... [OK] listen_ to_dbus ... [OK] application. plugins. tests.test_ plugins load_plugins ... [OK] application. pair.tests. test_network_ io successful_ lifespan ... [OK] application. pair.tests. test_couchdb_ io get_database_ names_replicata ble ... [OK] get_my_ host_unique_ id ... [OK] obsfuscation ... [OK] put_dynamic_ paired_ host ... [OK] put_static_ paired_ service ... [OK] application. tests.test_ service start_desktopco uch_replication ... [OK] start_migrate_ data ... [OK] start_new_ desktopcouch_ with_plugins ... [OK] application. tests.test_ local_files tegration with_no_ auth ... [OK] all_files_ returned ... [OK] bind_address ... [OK] couch_chain_ ini_files ... [OK] xdg_overwrite_ works ... [OK] application. tests.test_ start_local_ couchdb
Browse your desktop CouchDB at file://
desktopcouch.
TestMigration
test_
test_
test_
test_
TestRegistration
test_
desktopcouch.
TestUbuntoneP
test_
test_
test_
test_
TestUbuntuOne
test_
test_
test_
desktopcouch.
TestLoadPlugins
test_
desktopcouch.
TestNetworkIO
test_
desktopcouch.
TestCouchdbIo
test_
test_
test_mkuri ... [OK]
test_
test_
test_
desktopcouch.
TestService
test_
test_
test_
desktopcouch.
TestKeyringIn
test_with_auth ... [OK]
test_
TestLocalFiles
test_
test_
test_
test_
desktopcouch.
TestUpda...