Ubuntu One Control Panel

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

  1. check_subscribe_errors
  2. Merge into trunk
Proposed by Roberto Alsina
Status: Merged
Approved by: Alejandro J. Cura
Approved revision: 343
Merged at revision: 339
Proposed branch: lp://qastaging/~ralsina/ubuntuone-control-panel/check_subscribe_errors
Merge into: lp://qastaging/ubuntuone-control-panel
Diff against target: 124 lines (+61/-4)
3 files modified
ubuntuone/controlpanel/gui/__init__.py (+3/-0)
ubuntuone/controlpanel/gui/qt/folders.py (+14/-4)
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+44/-0)
To merge this branch: bzr merge lp://qastaging/~ralsina/ubuntuone-control-panel/check_subscribe_errors
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve
Brian Curtin (community) Approve
Eric Casteleijn (community) Approve
Review via email: mp+118420@code.qastaging.launchpad.net

Commit message

 - Give an error if the user subscribes a UDF and the local path is not a folder (Fixes LP:1033488)

Description of the change

Text approved by Robert Grant.

To test IRL, create a UDF, then unsubscribe from it, remove it from disk, and create a file in its place.
When you try to subscribe to it again, it will give an error.

For another test: create a UDF, unsubscribe it, remove it from disk, and create a valid symlink pointing to a folder. When you try to subscribe to it again, it will give an error.

To post a comment you must log in.
lp://qastaging/~ralsina/ubuntuone-control-panel/check_subscribe_errors updated
341. By Roberto Alsina

untypo

Revision history for this message
Eric Casteleijn (thisfred) wrote :

+1 with s/already exists in your device/already exists on your device/

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

When the symlink points to a folder, it gets wrongly detected as a folder, and then an IPCError occurs.

review: Needs Fixing
Revision history for this message
Alejandro J. Cura (alecu) wrote :

Just to be clear, a symlink pointing to a folder is not possible right now within syncdaemon, because that folder could be in a different filesystem, or on a removable drive, etc, etc.

lp://qastaging/~ralsina/ubuntuone-control-panel/check_subscribe_errors updated
342. By Roberto Alsina

add test for when you are subscribing to a folder that exists as a valid symlink pointing to a folder

343. By Roberto Alsina

handle case when you are subscribing to a folder that exists as a valid symlink pointing to a folder

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

Added test and handler for the case where the folder the user tries to subscribe is a symlink that points to a real folder.

I think this covers all possible combinations ;-)

Revision history for this message
Alejandro J. Cura (alecu) wrote :

Works exactly as described!

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