Ubuntu One Control Panel

Merge lp://qastaging/~ralsina/ubuntuone-control-panel/fix-959447 into lp://qastaging/ubuntuone-control-panel

  1. fix-959447
  2. Merge into trunk
Proposed by Roberto Alsina
Status: Merged
Approved by: Roberto Alsina
Approved revision: 323
Merged at revision: 320
Proposed branch: lp://qastaging/~ralsina/ubuntuone-control-panel/fix-959447
Merge into: lp://qastaging/ubuntuone-control-panel
Diff against target: 92 lines (+39/-3)
2 files modified
ubuntuone/controlpanel/gui/qt/folders.py (+10/-1)
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+29/-2)
To merge this branch: bzr merge lp://qastaging/~ralsina/ubuntuone-control-panel/fix-959447
Reviewer Review Type Date Requested Status
Brian Curtin (community) Approve
Diego Sarmentero (community) Approve
Review via email: mp+105704@code.qastaging.launchpad.net

Commit message

 - Made CalculateSize use bytes when calling os.walk (Fixes LP:959447).

Description of the change

Make CalculateSize use bytes for its path instead of unicode, so os.walk doesn't choke on invalid unicode paths.

To post a comment you must log in.
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

[FAIL]
Traceback (most recent call last):
  File "X:\ubuntuone-control-panel-ralsina2\ubuntuone\controlpanel\gui\qt\tests\
test_folders.py", line 1236, in test_add_music_folder_adds_the_folder
    self.test_folder_is_added(folder_path=MUSIC_PATH)
  File "X:\ubuntuone-control-panel-ralsina2\ubuntuone\controlpanel\gui\qt\tests\
test_folders.py", line 1232, in test_folder_is_added
    self.assert_folder_added(folder_path)
  File "X:\ubuntuone-control-panel-ralsina2\ubuntuone\controlpanel\gui\qt\tests\
test_folders.py", line 1005, in assert_folder_added
    unicode(item.text(gui.LOCAL_SUBSCRIPTION_COL)))
twisted.trial.unittest.FailTest: not equal:
a = u'Purchased Music'
b = u'.ubuntuone\\Purchased from Ubuntu One'

ubuntuone.controlpanel.gui.qt.tests.test_folders.LocalFoldersPanelAddFolderTestC
ase.test_add_music_folder_adds_the_folder

review: Needs Fixing
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
Revision history for this message
Brian Curtin (brian.curtin) wrote :

Looks good.

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