lp:~mandel/ubuntuone-client/fix-file-shelf-windows

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntuone-client at revision 1094

Natalia Bidart (community): Approve on 2011-08-05

Diff: 129 lines (+18/-19)

3 files modified

tests/syncdaemon/test_fileshelf.py (+5/-2)
tests/syncdaemon/test_vm.py (+5/-9)
ubuntuone/syncdaemon/file_shelf.py (+8/-8)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1129. By Manuel de la Peña on 2011-08-05

Re add the new line.

1128. By Manuel de la Peña on 2011-08-05

Use open_file instead of open in the tests.

1127. By Manuel de la Peña on 2011-08-05

Merged with trunk.

1126. By Manuel de la Peña on 2011-08-05

Skipped problematic test on Windows since the code is deprecated in that platform.

1125. By Manuel de la Peña on 2011-06-24

Ensured that the tests are using the context from mocker and that we use count which is nicer.

1124. By Manuel de la Peña on 2011-08-01

Ensured that fileshelf uses the os_helper methods so that all tests pass on winodws.

1123. By Manuel de la Peña on 2011-08-01

Ensured that the os_helper methods are used.

1122. By Manuel de la Peña on 2011-08-01

Merged with trunk.

1121. By Manuel de la Peña on 2011-08-01

Fixed bug with the file system notifications when starting the watch. We have to ensure that we do not have a race condition and that the deferred is not called more than once.

1120. By Manuel de la Peña on 2011-07-29

Fixed all the failing tests due to using the wrong paths.