desktopcouch

Merge lp://qastaging/~pedronis/desktopcouch/ctx-aware-replicate into lp://qastaging/desktopcouch

ctx-aware-replicate
Merge into trunk

Proposed by Samuele Pedroni on 2010-11-24

Status:	Merged
Approved by:	dobey on 2010-11-24
Approved revision:	225
Merged at revision:	227
Proposed branch:	lp://qastaging/~pedronis/desktopcouch/ctx-aware-replicate
Merge into:	lp://qastaging/desktopcouch
Diff against target:	31 lines (+4/-3) 1 file modified desktopcouch/application/pair/couchdb_pairing/couchdb_io.py (+4/-3)
To merge this branch:	bzr merge lp://qastaging/~pedronis/desktopcouch/ctx-aware-replicate
Related bugs:	Link a bug report

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

Commit message

make couchdb_io.replicate respect a ctx parameter as well

Description of the change

make couchdb_io.replicate respect a ctx parameter as well, useful to setup integration/function tests for replication (as is done in U1 servers)

Revision history for this message

Samuele Pedroni (pedronis) wrote on 2010-11-24:

how to test:

get the hackish lp:~pedronis/ubuntuone-servers/tryout-ctx-ware-dc-replicate

put or merge this branch in sourcecode/desktopcouch

run:

make start
./utilities/replication_testing.py --ssl

ignore the deprecation warnings but notice that it works (prints the expected Trues etc).

The main point of that branch is that replication_testing.py uses couchdb_io.replicate directly passing the ctx parameter instead of a modified copy of it :). The changes on that branch will have to be done cleanly when we really switch to use the new d-c on U1 server-side.

Revision history for this message

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

Awesome! Testing against u1servers did not work for me, but these fixes look good in themselves.

./run-test does give me some trivial pep8 issues:

./desktopcouch/application/tests/test_local_files.py:27:65: W291 trailing whitespace
./desktopcouch/application/tests/test_local_files.py:72:67: W291 trailing whitespace
./desktopcouch/application/tests/test_local_files.py:79:67: W291 trailing whitespace
./desktopcouch/records/tests/test_server.py:210:68: W291 trailing whitespace