Ubuntu One Client

Merge lp://qastaging/~diegosarmentero/ubuntuone-client/ubuntuone-client-timer into lp://qastaging/ubuntuone-client

ubuntuone-client-timer
Merge into trunk

Proposed by Diego Sarmentero on 2012-09-20

Status:

Merged

Approved by:

Diego Sarmentero on 2012-09-27

Approved revision:

1333

Merged at revision:

1325

Proposed branch:

lp://qastaging/~diegosarmentero/ubuntuone-client/ubuntuone-client-timer

Merge into:

lp://qastaging/ubuntuone-client

Diff against target:

492 lines (+121/-84)

9 files modified

tests/platform/sync_menu/test_linux.py (+32/-17)
tests/status/test_aggregator.py (+15/-0)
tests/syncdaemon/test_main.py (+0/-14)
tests/syncdaemon/test_status_listener.py (+2/-2)
ubuntuone/platform/sync_menu/common.py (+0/-10)
ubuntuone/platform/sync_menu/linux.py (+38/-23)
ubuntuone/status/aggregator.py (+29/-3)
ubuntuone/syncdaemon/main.py (+3/-13)
ubuntuone/syncdaemon/status_listener.py (+2/-2)

To merge this branch:

bzr merge lp://qastaging/~diegosarmentero/ubuntuone-client/ubuntuone-client-timer

Undecided

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Alejandro J. Cura (community)	2012-09-20	Approve on 2012-09-26
Mike McCracken (community)		Approve on 2012-09-26
Review via email: mp+125499@code.qastaging.launchpad.net

Commit message

- Using a timer event that doesn't fire continuously if another update timer is in progress (LP: #1052922).

lp://qastaging/~diegosarmentero/ubuntuone-client/ubuntuone-client-timer updated on 2012-09-20

1322. By Diego Sarmentero on 2012-09-20: merge
1323. By Diego Sarmentero on 2012-09-20: adding logging
1324. By Diego Sarmentero on 2012-09-20: fixing test
1325. By Diego Sarmentero on 2012-09-20: adding test for register_listener

Revision history for this message

Alejandro J. Cura (alecu) wrote on 2012-09-20:

This branch is wrong: it keeps using cpu while syncdaemon is idle.

review: Needs Fixing

lp://qastaging/~diegosarmentero/ubuntuone-client/ubuntuone-client-timer updated on 2012-09-25

1326. By Diego Sarmentero on 2012-09-21: Improving timer
1327. By Diego Sarmentero on 2012-09-21: merge
1328. By Diego Sarmentero on 2012-09-21: Timer delay improved
1329. By Diego Sarmentero on 2012-09-25: raise error when the object is not callable
1330. By Diego Sarmentero on 2012-09-25: tests fixed

Revision history for this message

Mike McCracken (mikemc) wrote on 2012-09-25:

OK. looks good - tests pass for me on linux, and there are no new tests to run on darwin or windows.
(I have a branch that'll add tests for windows and darwin)

review: Approve

Revision history for this message

Mike McCracken (mikemc) wrote on 2012-09-25:

I should've added - I couldn't IRL test this because I don't have Q running yet, and IRL on darwin dies because of the bug that my other branch fixes...

Revision history for this message

Mike McCracken (mikemc) wrote on 2012-09-26:

I just noticed this - this branch removes the method "start_timer" from the UbuntuOneSyncMenuLinux class, but not from the DummySyncMenu class in sync_menu/linux.py.
The test in test_linux.py tests the dummy for start_timer, so it also needs to be updated.

Don't worry about fixing the same issue in common.py, my branch will do that.

review: Needs Fixing

lp://qastaging/~diegosarmentero/ubuntuone-client/ubuntuone-client-timer updated on 2012-09-26

1331. By Diego Sarmentero on 2012-09-26: removing start_timer from dummy
1332. By Diego Sarmentero on 2012-09-26: adding missing update_transfers for dummy and test