Merge lp:~chipaca/ubuntuone-client/some-account-tab-fixes into lp:ubuntuone-client
Proposed by
John Lenton
Status: | Merged |
---|---|
Approved by: | John Lenton |
Approved revision: | 461 |
Merged at revision: | not available |
Proposed branch: | lp:~chipaca/ubuntuone-client/some-account-tab-fixes |
Merge into: | lp:ubuntuone-client |
Diff against target: |
276 lines (+190/-13) 2 files modified
bin/ubuntuone-preferences (+90/-13) tests/test_preferences.py (+100/-0) |
To merge this branch: | bzr merge lp:~chipaca/ubuntuone-client/some-account-tab-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matt Griffin (community) | Approve | ||
Stuart Langridge (community) | Approve | ||
Facundo Batista (community) | Approve | ||
Review via email:
|
Commit message
This adds the overquota notices and warnings, as well as a couple of ui elements that we missed. Fixes #540360.
Description of the change
This adds the overquota notices and warnings, as well as a couple of ui elements that we missed. Fixes #540360.
To post a comment you must log in.
tests.test_ preferences bw_throttling ... [OK] list_devices_ fills_devices_ list_with_ fake_result_ when_empty ... [OK] list_devices_ shows_devices_ list ... [OK] list_devices_ shows_real_ devices_ list ... [OK] login_check ... [OK] no_overquota_ notice_ on_low_ usage ... Traceback (most recent call last): facundo/ canonical/ u1-client/ review_ some-account- tab-fixes/ contrib/ mocker. py", line 102, in test_method_wrapper facundo/ canonical/ u1-client/ review_ some-account- tab-fixes/ tests/test_ preferences. py", line 232, in test_no_ overquota_ notice_ on_low_ usage UbuntuOneDialog (keyring= self.keyring) facundo/ canonical/ u1-client/ review_ some-account- tab-fixes/ bin/ubuntuone- preferences" , line 474, in __init__ __construct( ) facundo/ canonical/ u1-client/ review_ some-account- tab-fixes/ bin/ubuntuone- preferences" , line 759, in __construct update_ quota_display( 0, 2) facundo/ canonical/ u1-client/ review_ some-account- tab-fixes/ bin/ubuntuone- preferences" , line 566, in update_ quota_display plan_label. set_label( _("Payed" ) if is_payed_account else _("Free")) AttributeError: 'UbuntuOneDialog' object has no attribute 'plan_label' facundo/ canonical/ u1-client/ review_ some-account- tab-fixes/ bin/ubuntuone- preferences" , line 521, in __got_state status_ label.set_ text(_( "Synchronizatio n complete")) AttributeError: 'UbuntuOneDialog' object has no attribute 'status_label' overquota_ notice_ and_not_ upgrade_ offer_on_ payed_high_ usage ... Traceback (most recent call last): facundo/ canonical/ u1-client/ review_ some-account- tab-fixes/ contrib/ mocker. py", line 102, in test_method_wrapper facundo/ canonical/ u1-client/ review_ some-account- tab-fixes/ tests/test_ preferences. py", line 268, in test_overquota_ notice_ and_not_ upgrade_ offer_on_ payed_high_ usage UbuntuOneDialog (keyring= self.keyring) facundo/ canonical/ u1-client/ review_ some-account- tab-fixes/ bin/ubuntuone- preferences" , line 474, in __init__ __construct( ) facundo/ canonical/ u1-client/ review_ some-account- tab-fixes/ bin/ubuntuone- preferences" , line 759, in __construct update_ quota_display( 0, 2) facundo/ canonical/ u1-client/ review_ some-account- tab-fixes/ bin/ubuntuone- preferences" , line 566, in update_ quota_display plan_label. set_label( _("Payed" ) if is_payed_account else _("Free")) AttributeError: 'UbuntuOneDialog' object has no attribute 'plan_label' facundo/ canonical/ u1-client/ review_ some-account- tab-fixes/ bin/ubuntuone- preferences" , line 521, in __got_state status_ label.set_ text(_( "Synchronizatio n complete")) AttributeError: 'UbuntuOneDialog' object has no a...
PreferencesTests
test_
test_
test_
test_
test_
test_
File "/home/
result = test_method()
File "/home/
dialog = self.u1prefs.
File "/home/
self.
File "/home/
self.
File "/home/
self.
exceptions.
[ERROR]
Traceback (most recent call last):
File "/home/
self.
exceptions.
[ERROR]
test_
File "/home/
result = test_method()
File "/home/
dialog = self.u1prefs.
File "/home/
self.
File "/home/
self.
File "/home/
self.
exceptions.
[ERROR]
Traceback (most recent call last):
File "/home/
self.
exceptions.