desktopcouch

Merge lp://qastaging/~vds/desktopcouch/fix_delete_record_reconnection into lp://qastaging/desktopcouch

fix_delete_record_reconnection
Merge into trunk

Proposed by Vincenzo Di Somma on 2010-09-29

Status:

Merged

Approved by:

Manuel de la Peña on 2010-09-30

Approved revision:

179

Merged at revision:

178

Proposed branch:

lp://qastaging/~vds/desktopcouch/fix_delete_record_reconnection

Merge into:

lp://qastaging/desktopcouch

Diff against target:

90 lines (+35/-14)

2 files modified

desktopcouch/records/server_base.py (+13/-10)
desktopcouch/records/tests/test_server.py (+22/-4)

To merge this branch:

bzr merge lp://qastaging/~vds/desktopcouch/fix_delete_record_reconnection

High

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Manuel de la Peña (community)		Approve on 2010-09-30
Vincenzo Di Somma (community)		Approve on 2010-09-30
Eric Casteleijn (community)	2010-09-29	Approve on 2010-09-29
Review via email: mp+37006@code.qastaging.launchpad.net

Commit message

Fixes a problem with delete files and reconnection.

Description of the change

Fixes a problem with delete files and reconnection.

Revision history for this message

Eric Casteleijn (thisfred) wrote on 2010-09-29:

Looks good, tests pass

review: Approve

Revision history for this message

Vincenzo Di Somma (vds) wrote on 2010-09-30:

Three unrelated errors in tests. Looks very good!

===============================================================================
[ERROR]: canonical.tests.test_share_sync.TestShareClientMove.test_syncs_get_changed_file_hash

Traceback (most recent call last):
Failure: ubuntuone.u1sync.main.TreesDiffer:
===============================================================================
[ERROR]: canonical.tests.test_sync.TestClientMove.test_syncs_get_changed_file_hash

Traceback (most recent call last):
Failure: ubuntuone.u1sync.main.TreesDiffer:
===============================================================================
[ERROR]: canonical.tests.test_udf_sync.TestUDFClientMove.test_syncs_get_changed_file_hash