Merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/subscribe into lp://qastaging/ubuntuone-control-panel
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | dobey | ||||||||
Approved revision: | 34 | ||||||||
Merged at revision: | 33 | ||||||||
Proposed branch: | lp://qastaging/~nataliabidart/ubuntuone-control-panel/subscribe | ||||||||
Merge into: | lp://qastaging/ubuntuone-control-panel | ||||||||
Diff against target: |
994 lines (+486/-123) 8 files modified
data/folders.ui (+39/-1) ubuntuone/controlpanel/backend.py (+37/-8) ubuntuone/controlpanel/dbus_client.py (+46/-6) ubuntuone/controlpanel/gtk/gui.py (+55/-26) ubuntuone/controlpanel/gtk/tests/test_gui.py (+107/-17) ubuntuone/controlpanel/integrationtests/test_dbus_client_sd.py (+89/-42) ubuntuone/controlpanel/integrationtests/test_dbus_service.py (+8/-8) ubuntuone/controlpanel/tests/test_backend.py (+105/-15) |
||||||||
To merge this branch: | bzr merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/subscribe | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alejandro J. Cura (community) | Approve | ||
Roberto Alsina (community) | Approve | ||
Review via email:
|
Description of the change
To run the tests, use the command:
./run-tests
To test, open 2 terminals pointing to this branch.
You can confirm that subscribe/
In terminal 1:
mkdir ~/dummy-udf-0
mkdir ~/dummy-udf-1
u1sdtool --create-
u1sdtool --create-
DEBUG=True PYTHONPATH=. ./bin/ubuntuone
In terminal 2:
DEBUG=True PYTHONPATH=. ./bin/ubuntuone
You'll see the 2 newly created UDFs, and if you check/uncheck the 'Subscribed' checkbutton, you'll be able to confirm using
u1sdtool --list-folders
if the udf is properly sunscribed/
I approve it, if alecu approves the UI and runs the test suite.