Merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/subscribe into lp://qastaging/ubuntuone-control-panel

Proposed by Natalia Bidart
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
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve
Roberto Alsina (community) Approve
Review via email: mp+43663@code.qastaging.launchpad.net

Commit message

* User can now subcribe and unsubscribe from folders (LP: #689646).
* Dbus booleans are now those strings whose bool() defines its value. So, '' for False and any other non empty string for True (LP: #683619).

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/unsubscribe works by first creating a dummy UDF in syncdaemon with:

In terminal 1:

mkdir ~/dummy-udf-0
mkdir ~/dummy-udf-1

u1sdtool --create-folder=/home/username/dummy-udf-0
u1sdtool --create-folder=/home/username/dummy-udf-1

DEBUG=True PYTHONPATH=. ./bin/ubuntuone-control-panel-backend

In terminal 2:

DEBUG=True PYTHONPATH=. ./bin/ubuntuone-control-panel-gtk

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/unsubscribed

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) wrote :

I approve it, if alecu approves the UI and runs the test suite.

review: Approve
Revision history for this message
Alejandro J. Cura (alecu) wrote :

I've looked at the code, run the test suite, field tested it. And I'm approving.

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (45.9 KiB)

The attempt to merge lp:~nataliabidart/ubuntuone-control-panel/subscribe into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

Running test suite for ubuntuone/controlpanel
ubuntuone.controlpanel.tests.test_backend
  BackendAccountTestCase
    test_account_info ... [OK]
    test_account_info_fails ... [OK]
    test_backend_creation ... [OK]
    test_get_token ... [OK]
  BackendBasicTestCase
    test_backend_creation ... [OK]
    test_get_token ... [OK]
  BackendDevicesTestCase
    test_backend_creation ... [OK]
    test_change_download_speed_limit ... [OK]
    test_change_limit_bandwidth ... [OK]
    test_change_upload_speed_limit ... [OK]
    test_changing_settings_for_wrong_id_has_no_effect ... [OK]
    test_devices_info ... [OK]
    test_devices_info_fails ... [OK]
    test_get_token ... [OK]
    test_remove_device ... [OK]
    test_remove_device_fails ... [OK]
  BackendSyncStatusTestCase
    test_backend_creation ... [OK]
    test_disabled ... [OK]
    test_disconnected ... [OK]
    test_error ... [OK]
    test_get_token ... [OK]
    test_idle ... [OK]
    test_starting_when_init_not_user ... [OK]
    test_starting_when_init_with_user ... [OK]
    test_starting_when_local_rescan_not_user ... [OK]
    test_starting_when_local_rescan_with_user ... [OK]
    test_starting_when_ready_with_user ... [OK]
    test_status_changed ... [OK]
    test_syncing_even_if_not_online ... [OK]
    test_syncing_if_online ... [OK]
    test_unknown ... [OK]
  BackendVolumesTestCase
    test_backend_creation ... [OK]
    test_change_volume_settings ... [OK]
    test_change_volume_settings_no_setting ... [OK]
    test_get_token ... [OK]
    test_subscribe_volume ......

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches