Ubuntu One Control Panel

Merge lp://qastaging/~ralsina/ubuntuone-control-panel/decrypt-errors-3-0 into lp://qastaging/ubuntuone-control-panel/stable-3-0

  1. decrypt-errors-3-0
  2. Merge into stable-3-0
Proposed by Roberto Alsina
Status: Merged
Approved by: dobey
Approved revision: 264
Merged at revision: 264
Proposed branch: lp://qastaging/~ralsina/ubuntuone-control-panel/decrypt-errors-3-0
Merge into: lp://qastaging/ubuntuone-control-panel/stable-3-0
Diff against target: 59 lines (+21/-0)
3 files modified
ubuntuone/controlpanel/backend.py (+7/-0)
ubuntuone/controlpanel/gui/qt/ubuntuonebin.py (+5/-0)
ubuntuone/controlpanel/tests/test_backend.py (+9/-0)
To merge this branch: bzr merge lp://qastaging/~ralsina/ubuntuone-control-panel/decrypt-errors-3-0
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve
dobey (community) Approve
Review via email: mp+107671@code.qastaging.launchpad.net

Commit message

 - Hides cryptic error (Fixes LP:1002377).

Description of the change

Fixes something that only happens on windows, where a failure to start syncdaemon will cause sd_client to be None.

Proposing only for stable-3-0 because in trunk, with endpoints, this is not supposed to happen anymore, but we will still do future windows releases from 3-0

This should not have any effects on Ubuntu.

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Manuel de la Peña (mandel) wrote :

A little ugly but works and is not needed in trunk.

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

The attempt to merge lp:~ralsina/ubuntuone-control-panel/decrypt-errors-3-0 into lp:ubuntuone-control-panel/stable-3-0 failed. Below is the output from the failed tests.

*** Running test suite for ubuntuone/controlpanel ***
ubuntuone.controlpanel.tests.test_replication_client
  ReplicationsTestCase
    test_exclude ... [OK]
    test_exclude_name_in_exclusions ... [OK]
    test_exclude_name_not_in_replications ... [OK]
    test_get_exclusions ... [OK]
    test_get_replications ... [OK]
    test_no_pairing_record ... [OK]
    test_replicate ... [OK]
    test_replicate_name_not_in_exclusions ... [OK]
    test_replicate_name_not_in_replications ... [OK]
ubuntuone.controlpanel.tests
  TestCase
    runTest ... [OK]
ubuntuone.controlpanel.tests.test_backend
  BackendAccountTestCase
    test_account_info ... [OK]
    test_account_info_fails ... [OK]
    test_account_info_fails_with_unauthorized ... [OK]
    test_account_info_with_current_plan ... [OK]
    test_backend_creation ... [OK]
    test_device_is_local ... [OK]
    test_get_token ... [OK]
    test_login_client_is_cached ... [OK]
    test_sd_client_is_cached ... [OK]
    test_shutdown_func ... [OK]
    test_shutdown_func_is_called_on_shutdown ... [OK]
    test_shutdown_func_when_none ... [OK]
  BackendBasicTestCase
    test_backend_creation ... [OK]
    test_device_is_local ... [OK]
    test_get_token ... [OK]
    test_login_client_is_cached ... [OK]
    test_sd_client_is_cached ... [OK]
    test_shutdown_func ... [OK]
    test_shutdown_func_is_called_on_shutdown ... [OK]
    test_shutdown_func_when_none ... [OK]
  BackendCredentialsTestCase
    test_backend_creation ... [OK]
    test_clear_credentials ... [OK]
    test_clear_credentials_invalidates_cached_credentials ... [OK]
    test_credentials_are_cached ... [OK]
    test_device_is_l...

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