Ubuntu One Control Panel

Merge lp://staging/~diegosarmentero/ubuntuone-control-panel/tests-failing into lp://staging/ubuntuone-control-panel

  1. tests-failing
  2. Merge into trunk
Proposed by Diego Sarmentero
Status: Merged
Approved by: Diego Sarmentero
Approved revision: 332
Merged at revision: 329
Proposed branch: lp://staging/~diegosarmentero/ubuntuone-control-panel/tests-failing
Merge into: lp://staging/ubuntuone-control-panel
Diff against target: 147 lines (+37/-15)
3 files modified
data/qt/images.qrc (+1/-0)
ubuntuone/controlpanel/gui/qt/folders.py (+25/-12)
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+11/-3)
To merge this branch: bzr merge lp://staging/~diegosarmentero/ubuntuone-control-panel/tests-failing
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Brian Curtin (community) Approve
Review via email: mp+107799@code.staging.launchpad.net

Commit message

- Using suggested_path to server path comparisons (LP: 1004603).

To post a comment you must log in.
lp://staging/~diegosarmentero/ubuntuone-control-panel/tests-failing updated
330. By Diego Sarmentero

removing unnecesary import

331. By Diego Sarmentero

Linking bug

332. By Diego Sarmentero

adding test with ~/

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

Looks good to me. Passes on Windows.

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

+1

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