Merge lp://staging/~ralsina/ubuntuone-control-panel/fix-959447 into lp://staging/ubuntuone-control-panel
Proposed by
Roberto Alsina
Status: | Merged |
---|---|
Approved by: | Roberto Alsina |
Approved revision: | 323 |
Merged at revision: | 320 |
Proposed branch: | lp://staging/~ralsina/ubuntuone-control-panel/fix-959447 |
Merge into: | lp://staging/ubuntuone-control-panel |
Diff against target: | 92 lines (+39/-3) |
To merge this branch: | bzr merge lp://staging/~ralsina/ubuntuone-control-panel/fix-959447 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brian Curtin (community) | Approve | ||
Diego Sarmentero (community) | Approve | ||
Review via email: mp+105704@code.staging.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.
[FAIL]control-panel-ralsina2\ubuntuone\controlpanel\gui\qt\tests\music_folder_adds_the_foldertest_folder_is_added(folder_path=MUSIC_PATH)control-panel-ralsina2\ubuntuone\controlpanel\gui\qt\tests\is_addedassert_folder_added(folder_path)control-panel-ralsina2\ubuntuone\controlpanel\gui\qt\tests\item.text(gui.LOCAL_SUBSCRIPTION_COL)))trial.unittest.FailTest: not equal:\Purchased from Ubuntu One'
Traceback (most recent call last):
File "X:\ubuntuone-
test_folders.py", line 1236, in test_add_
self.
File "X:\ubuntuone-
test_folders.py", line 1232, in test_folder_
self.
File "X:\ubuntuone-
test_folders.py", line 1005, in assert_folder_added
unicode(
twisted.
a = u'Purchased Music'
b = u'.ubuntuone\
ubuntuone.controlpanel.gui.qt.tests.test_folders.LocalFoldersPanelAddFolderTestCadd_music_folder_adds_the_folder
ase.test_