lp:~nataliabidart/ubuntuone-client/run-upload-run-stable-2-0

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntuone-client/stable-2-0 at revision 1142

Facundo Batista (community): Approve on 2011-11-08

Joshua Hoover (community): Approve (tested) on 2011-11-07

Diff: 946 lines (+165/-87)

14 files modified

tests/platform/linux/eventlog/test_zglog.py (+3/-2)
tests/platform/linux/test_dbus.py (+2/-1)
tests/platform/linux/test_messaging.py (+1/-9)
tests/platform/linux/test_notification.py (+1/-9)
tests/platform/linux/test_unity.py (+3/-0)
tests/platform/linux/test_vm.py (+6/-2)
tests/platform/test_interaction_interfaces.py (+18/-8)
tests/status/test_aggregator.py (+20/-2)
tests/syncdaemon/test_action_queue.py (+58/-13)
tests/syncdaemon/test_logger.py (+11/-0)
tests/syncdaemon/test_pathlockingtree.py (+8/-0)
tests/syncdaemon/test_states.py (+16/-5)
tests/syncdaemon/test_status_listener.py (+2/-1)
ubuntuone/syncdaemon/action_queue.py (+16/-35)

api

Superseded for merging into lp:ubuntuone-client

Ubuntu One hackers: Pending requested 2011-11-07

Diff: 2080 lines (+1928/-0) (has conflicts)

4 files modified

tests/platform/linux/test_dbus.py (+1685/-0)
tests/platform/linux/test_notification.py (+7/-0)
tests/status/test_aggregator.py (+5/-0)
tests/syncdaemon/test_interaction_interfaces.py (+231/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #872924: Resuming a failed upload crashes with ValueError: I/O operation on closed file	Critical	Fix Released
Bug #884959: ActionQueue does not reset tempfile	Critical	Fix Released

Link a bug report

Related blueprints

1144. By Natalia Bidart on 2011-11-07

All tests green, now for sure.

1143. By Natalia Bidart on 2011-11-07

All tests are green now.

1142. By Natalia Bidart on 2011-11-07

- Make the Upload process do not close the tempfile until is finished
 (LP: #872924).
- Reset the tempfile on every Upload _run() (LP: #884959).

1141. By Facundo Batista on 2011-10-06

Fix filter by share and path (LP: #807737).

1140. By dobey on 2011-09-27

[release] 2.0.0

1139. By Guillermo Gonzalez on 2011-09-26

fix Tritcask.should_merge method to support missing stats for a data file.

1138. By Guillermo Gonzalez on 2011-09-26

Fix Tritcask._find_data_files method to handle the case of broken/corrupted data files (when opening the file).

1137. By dobey on 2011-09-26

Append directory separator to UDF path before comparing

1136. By dobey on 2011-09-26

Use the right new .desktop file for the launcher object

1135. By Alejandro J. Cura on 2011-09-14

Don't log the credentials (LP: #848988)