Ubuntu One Control Panel

Merge lp://qastaging/~dobey/ubuntuone-control-panel/update-4-0 into lp://qastaging/ubuntuone-control-panel/stable-4-0

  1. update-4-0
  2. Merge into stable-4-0
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: no longer in the source branch.
Merged at revision: 335
Proposed branch: lp://qastaging/~dobey/ubuntuone-control-panel/update-4-0
Merge into: lp://qastaging/ubuntuone-control-panel/stable-4-0
Diff against target: 2345 lines (+1516/-167)
28 files modified
data/qt/controlpanel.ui (+13/-2)
data/qt/share_links.ui (+133/-0)
docs/ubuntuone-control-panel-qt.1 (+1/-1)
run-tests (+4/-8)
run-tests.bat (+1/-1)
ubuntuone/controlpanel/backend.py (+14/-0)
ubuntuone/controlpanel/gui/__init__.py (+21/-0)
ubuntuone/controlpanel/gui/qt/__init__.py (+78/-0)
ubuntuone/controlpanel/gui/qt/controlpanel.py (+4/-0)
ubuntuone/controlpanel/gui/qt/filesyncstatus.py (+4/-77)
ubuntuone/controlpanel/gui/qt/folders.py (+14/-4)
ubuntuone/controlpanel/gui/qt/gui.py (+1/-1)
ubuntuone/controlpanel/gui/qt/main/__init__.py (+16/-2)
ubuntuone/controlpanel/gui/qt/main/tests/test_main.py (+35/-0)
ubuntuone/controlpanel/gui/qt/share_links.py (+42/-0)
ubuntuone/controlpanel/gui/qt/systray.py (+316/-23)
ubuntuone/controlpanel/gui/qt/tests/__init__.py (+16/-1)
ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py (+30/-29)
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+44/-0)
ubuntuone/controlpanel/gui/qt/tests/test_gui.py (+5/-0)
ubuntuone/controlpanel/gui/qt/tests/test_share_links.py (+37/-0)
ubuntuone/controlpanel/gui/qt/tests/test_systray.py (+481/-18)
ubuntuone/controlpanel/sd_client/__init__.py (+4/-0)
ubuntuone/controlpanel/tests/test_backend.py (+12/-0)
ubuntuone/controlpanel/utils/__init__.py (+10/-0)
ubuntuone/controlpanel/utils/darwin.py (+91/-0)
ubuntuone/controlpanel/utils/tests/test_darwin.py (+78/-0)
ubuntuone/controlpanel/utils/tests/test_utils.py (+11/-0)
To merge this branch: bzr merge lp://qastaging/~dobey/ubuntuone-control-panel/update-4-0
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) trivial Approve
Review via email: mp+120874@code.qastaging.launchpad.net

Commit message

[Diego Sarmentero]

    - Adding Share Links Tab UI (LP: #1039142).
    - Show the not accepted shares (LP: #1034542).
    - Show current and recent transfers on the transfers menu (LP: #1034542).
    - Adding open (folder, program, url) actions to the menu (LP: #1034542)
    - Adding status actions to the system tray menu (LP: #1034542).

[Mike McCracken]

    - Remove use of env vars for u1lint and u1trial from old buildout. (LP: #1037904)
    - Add darwin-only function to perform first-run "install" steps (LP: #1024623)

[Roberto Alsina]

     - Give an error if the user subscribes a UDF and the local path is not a folder (LP:1033488)
     - Prevented loading of the scrollbar overlay (LP:1007421).

To post a comment you must log in.
Revision history for this message
Alejandro J. Cura (alecu) wrote :

Looks just like trunk. +1.

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

The attempt to merge lp:~dobey/ubuntuone-control-panel/update-4-0 into lp:ubuntuone-control-panel/stable-4-0 failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ... [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ... [OK]
  DBusServiceTestCase
    test_cant_register_twice ... [SKIPPED]
    test_dbus_busname_created ... [OK]
    test_error_handler_default ... [OK]
    test_error_handler_with_exception ... [OK]
    test_error_handler_with_failure ... [OK]
    test_error_handler_with_non_string_dict ... [OK]
    test_error_handler_with_string_dict ... [OK]
    test_register_service ... [OK]
  FileSyncTestCase
    test_file_sync_status_changed ... [OK]
    test_file_sync_status_disabled ... [OK]
    test_file_sync_status_disconnected ... [OK]
    test_file_sync_status_error ... [OK]
    test_file_sync_status_idle ... [OK]
    test_file_sync_status_starting ... [OK]
    test_file_sync_status_stopped ... [OK]
    test_file_sync_status_syncing ... [OK]
    test_file_sync_status_unknown ... [OK]
    test_status_changed_handler ... [OK]
    test_status_changed_handler_after_status_requested ... [OK]
    test_status_changed_handler_after_status_requested_twice ... [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ... [OK]
    test_change_device_settings ... [OK]
    test_change_replication_settings ... [OK]
    test_change_volume_settings ... [OK]
    test_connect_files ... [OK]
    test_devices_info_returned ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_remove_device ... [OK]
    test_replications_info ... [OK]
    test_restart_files ... [OK]
    t...

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

The attempt to merge lp:~dobey/ubuntuone-control-panel/update-4-0 into lp:ubuntuone-control-panel/stable-4-0 failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ... [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ... [OK]
  DBusServiceTestCase
    test_cant_register_twice ... [SKIPPED]
    test_dbus_busname_created ... [OK]
    test_error_handler_default ... [OK]
    test_error_handler_with_exception ... [OK]
    test_error_handler_with_failure ... [OK]
    test_error_handler_with_non_string_dict ... [OK]
    test_error_handler_with_string_dict ... [OK]
    test_register_service ... [OK]
  FileSyncTestCase
    test_file_sync_status_changed ... [OK]
    test_file_sync_status_disabled ... [OK]
    test_file_sync_status_disconnected ... [OK]
    test_file_sync_status_error ... [OK]
    test_file_sync_status_idle ... [OK]
    test_file_sync_status_starting ... [OK]
    test_file_sync_status_stopped ... [OK]
    test_file_sync_status_syncing ... [OK]
    test_file_sync_status_unknown ... [OK]
    test_status_changed_handler ... [OK]
    test_status_changed_handler_after_status_requested ... [OK]
    test_status_changed_handler_after_status_requested_twice ... [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ... [OK]
    test_change_device_settings ... [OK]
    test_change_replication_settings ... [OK]
    test_change_volume_settings ... [OK]
    test_connect_files ... [OK]
    test_devices_info_returned ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_remove_device ... [OK]
    test_replications_info ... [OK]
    test_restart_files ... [OK]
    t...

lp://qastaging/~dobey/ubuntuone-control-panel/update-4-0 updated
335. By Roberto Alsina

[Diego Sarmentero]

    - Adding Share Links Tab UI (LP: #1039142).
    - Show the not accepted shares (LP: #1034542).
    - Show current and recent transfers on the transfers menu (LP: #1034542).
    - Adding open (folder, program, url) actions to the menu (LP: #1034542)
    - Adding status actions to the system tray menu (LP: #1034542).

[Mike McCracken]

    - Remove use of env vars for u1lint and u1trial from old buildout. (LP: #1037904)
    - Add darwin-only function to perform first-run "install" steps (LP: #1024623)

[Roberto Alsina]

     - Give an error if the user subscribes a UDF and the local path is not a folder (LP:1033488)
     - Prevented loading of the scrollbar overlay (LP:1007421).

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

to all changes: