lp://staging/~nataliabidart/ubuntuone-client/yield-around

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntuone-client at revision 836

Roberto Alsina (community): Approve on 2011-02-03

Eric Casteleijn (community): Approve on 2011-02-03

Diff: 2089 lines (+383/-282)

10 files modified

tests/eventlog/test_zg_listener.py (+9/-7)
tests/platform/linux/test_dbus.py (+150/-106)
tests/platform/linux/test_filesystem_notifications.py (+14/-7)
tests/platform/linux/test_tools.py (+4/-3)
tests/syncdaemon/test_eq_inotify.py (+10/-7)
tests/syncdaemon/test_fsm.py (+113/-84)
tests/syncdaemon/test_localrescan.py (+61/-44)
tests/syncdaemon/test_status_listener.py (+5/-5)
tests/syncdaemon/test_sync.py (+8/-9)
tests/syncdaemon/test_u1sdtool.py (+9/-10)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #689677: DBusException when running tests	High	Fix Released
Bug #708335: Add subscription capabilities to shares	High	Fix Released

Link a bug report

Related blueprints

838. By Natalia Bidart on 2011-02-03

ZG tests should also yield on vm.add_share.

837. By Natalia Bidart on 2011-02-03

Merged trunk in.

836. By Natalia Bidart on 2011-02-03

Attaching bug #708335.

835. By Natalia Bidart on 2011-02-03

- volume_manager.add_share returns a deferred now, yield on it (part of bug #708335).

- Fix tests that were finishing before the dbus call was completed (LP: #689677).

834. By Natalia Bidart on 2011-02-03

- Share have now subscroption capabilities (part of LP: #708335).
- Non active volumes do not process new generation notifications from the server (LP: #682878).

833. By Natalia Bidart on 2011-02-02

- Adding 'share-autosubscribe' config option (part of LP: #708335).

832. By dobey on 2011-02-02

Add --c-include to scanner args to include a header reference in the .gir
Add _EXPORT_PACKAGES variable for .gir to include package name
Check for VAPIGEN and VALAC to enable building the .vapi
Add the rules to generate a .vapi from the .gir file
Add a test to ensure the .vapi works when building a vala program

831. By Eric Casteleijn on 2011-02-02

- Notifications can now be updated as well as appended to
- Messages can have a count, which can be updated after they are displayed

830. By dobey on 2011-02-02

Inherit from the devtools DBusTestCase as well as BaseTwistedTestCase to ensure the dbus runner gets run

829. By Natalia Bidart on 2011-02-01

Updating script to dumo metadata (all credits to verterok).