Ubuntu One Control Panel

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

  1. fix-file_path-construction
  2. Merge into trunk
Proposed by Brian Curtin on 2012-10-29
Status: Merged
Approved by: Brian Curtin on 2012-10-29
Approved revision: 374
Merged at revision: 374
Proposed branch: lp:~brian.curtin/ubuntuone-control-panel/fix-file_path-construction
Merge into: lp: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:~brian.curtin/ubuntuone-control-panel/fix-file_path-construction
Reviewer Review Type Date Requested Status
Diego Sarmentero (community) 2012-10-29 Approve on 2012-10-29
Review via email: mp+131966@code.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.
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
1=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py'
2--- ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py 2012-10-23 14:30:26 +0000
3+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py 2012-10-29 18:34:20 +0000
4@@ -224,7 +224,7 @@
5 """Test the File Item."""
6
7 class_ui = gui.FileItem
8- file_path = '/home/tester/ubuntu/file1.txt'
9+ file_path = os.path.join(USER_HOME, 'ubuntu', 'file1.txt')
10 kwargs = {'file_path': file_path}
11
12 @defer.inlineCallbacks

Subscribers

People subscribed via source and target branches