Merge lp:~facundo/ubuntuone-client/stable--query-no-content-file into lp:ubuntuone-client/stable-1-2
Proposed by
Facundo Batista
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Facundo Batista | ||||
Approved revision: | 511 | ||||
Merged at revision: | 512 | ||||
Proposed branch: | lp:~facundo/ubuntuone-client/stable--query-no-content-file | ||||
Merge into: | lp:ubuntuone-client/stable-1-2 | ||||
Diff against target: |
210 lines (+93/-20) 3 files modified
tests/syncdaemon/test_sync.py (+74/-13) ubuntuone/syncdaemon/sync.py (+16/-4) ubuntuone/syncdaemon/u1fsfsm.py (+3/-3) |
||||
To merge this branch: | bzr merge lp:~facundo/ubuntuone-client/stable--query-no-content-file | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Guillermo Gonzalez | Approve | ||
Tim Cole (community) | Approve | ||
Review via email: mp+25005@code.launchpad.net |
Commit message
Queue an upload again on SV_HASH_NEW if being LOCAL with hashes ok.
Description of the change
Queue an upload again on SV_HASH_NEW if being LOCAL with hashes ok.
Refactored the tests a little to include more cases.
This is a backport from trunk.
To post a comment you must log in.
Looks good! tests pass.