Ubuntu One Control Panel

Merge lp://qastaging/~brian.curtin/ubuntuone-control-panel/fix-file_path-construction into lp://qastaging/ubuntuone-control-panel

  1. fix-file_path-construction
  2. Merge into trunk
Proposed by Brian Curtin
Status: Merged
Approved by: Brian Curtin
Approved revision: 374
Merged at revision: 374
Proposed branch: lp://qastaging/~brian.curtin/ubuntuone-control-panel/fix-file_path-construction
Merge into: lp://qastaging/ubuntuone-control-panel
Diff against target: 12 lines (+1/-1)
1 file modified
ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py (+1/-1)
To merge this branch: bzr merge lp://qastaging/~brian.curtin/ubuntuone-control-panel/fix-file_path-construction
Reviewer Review Type Date Requested Status
Diego Sarmentero (community) Approve
Review via email: mp+131966@code.qastaging.launchpad.net

Commit message

- Fix a failing test on Windows by creating a platform-correct file_path to be tested.

Description of the change

Windows tests are failing because FileItemTestCase.file_path is a UNIX path that goes through test_reduce_path, doesn't get converted, then is expected to be reduced. Create the file_path with a platform-correct string and it passes.

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

good catch!
+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