Ubuntu One Control Panel

Merge lp://staging/~ralsina/ubuntuone-control-panel/sort-shares into lp://staging/ubuntuone-control-panel

  1. sort-shares
  2. Merge into trunk
Proposed by Roberto Alsina
Status: Merged
Approved by: Roberto Alsina
Approved revision: 334
Merged at revision: 330
Proposed branch: lp://staging/~ralsina/ubuntuone-control-panel/sort-shares
Merge into: lp://staging/ubuntuone-control-panel
Diff against target: 205 lines (+42/-68)
2 files modified
ubuntuone/controlpanel/gui/qt/folders.py (+3/-0)
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+39/-68)
To merge this branch: bzr merge lp://staging/~ralsina/ubuntuone-control-panel/sort-shares
Reviewer Review Type Date Requested Status
dobey (community) Approve
Manuel de la Peña (community) Approve
Review via email: mp+108594@code.staging.launchpad.net

Commit message

 - Enable folder list sorting (Fixes LP:1006385).

Description of the change

Enable sorting by the 1st column in the control panel's folder list.

This has one maybe unexpected side effect, which is that on languages where "My personal folders" is > "Shared by" you get the shares on top. I don't think that is really a problem.

The sort order is tested by test_process_info, which will compare the item order to case-insensitive-sorted data.

To post a comment you must log in.
Revision history for this message
Manuel de la Peña (mandel) :
review: Approve
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (147.4 KiB)

The attempt to merge lp:~ralsina/ubuntuone-control-panel/sort-shares into lp:ubuntuone-control-panel 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_sd_client
  AutoconnectTestCase
    test_disable ... [OK]
    test_disable_throws_an_error ... [OK]
    test_enable ... [OK]
    test_enable_throws_an_error ... [OK]
    test_get_value ... [OK]
    test_get_value_throws_an_error ... [OK]
  BaseTestCase
    runTest ... [OK]
  BasicTestCase
    test_get_current_status ... [OK]
    test_get_current_status_error ... [OK]
    test_get_root_dir ... [OK]
    test_get_shares_dir ... [OK]
    test_get_shares_dir_link ... [OK]
  FileSyncTestCase
    test_connect_file_sync ... [OK]
    test_disable_file_sync ... [OK]
    test_disconnect_file_sync ... [OK]
    test_enable_file_sync ... [OK]
    test_file_sync_enabled ... [OK]
    test_set_status_changed_handler ... [OK]
    test_start_file_sync ... [OK]
    test_stop_file_sync ... [OK]
  FoldersTestCase
    test_create_folder ... [OK]
    test_create_folder_error ... [OK]
    test_get_folders ... [OK]
    test_get_folders_error ... [OK]
    test_subscribe_fold...

lp://staging/~ralsina/ubuntuone-control-panel/sort-shares updated
332. By Roberto Alsina

make test_focus_order not depend on the order of the items

333. By Roberto Alsina

no more tests relying on the order of the items on the display

Revision history for this message
dobey (dobey) wrote :

+ #self.assertTrue(item is None)

Why is this commented out?

review: Needs Fixing
lp://staging/~ralsina/ubuntuone-control-panel/sort-shares updated
334. By Roberto Alsina

removed remnant

Revision history for this message
Roberto Alsina (ralsina) wrote :

> + #self.assertTrue(item is None)
>
> Why is this commented out?

Leftover from old code. Removed in revno 334

Revision history for this message
dobey (dobey) :
review: Approve

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