Ubuntu One Client

Merge lp://qastaging/~brian.curtin/ubuntuone-client/824252-validate-path-export into lp://qastaging/ubuntuone-client

  1. 824252-validate-path-export
  2. Merge into trunk
Proposed by Brian Curtin
Status: Merged
Approved by: Natalia Bidart
Approved revision: 1189
Merged at revision: 1193
Proposed branch: lp://qastaging/~brian.curtin/ubuntuone-client/824252-validate-path-export
Merge into: lp://qastaging/ubuntuone-client
Diff against target: 303 lines (+176/-9)
9 files modified
tests/platform/test_external_interface.py (+10/-0)
tests/syncdaemon/test_interaction_interfaces.py (+10/-0)
tests/syncdaemon/test_vm.py (+107/-1)
ubuntuone/platform/linux/dbus_interface.py (+6/-0)
ubuntuone/platform/tools/__init__.py (+8/-0)
ubuntuone/platform/windows/ipc.py (+5/-0)
ubuntuone/platform/windows/ipc_client.py (+4/-0)
ubuntuone/syncdaemon/interaction_interfaces.py (+7/-0)
ubuntuone/syncdaemon/volume_manager.py (+19/-8)
To merge this branch: bzr merge lp://qastaging/~brian.curtin/ubuntuone-client/824252-validate-path-export
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Roberto Alsina (community) Approve
Review via email: mp+91443@code.qastaging.launchpad.net

Commit message

- Exported validate_path_from_folder from volume_manager instead of ubuntuone-control-panel's backend (lp:824252)

Description of the change

Fix lp:824252 by moving validate_path_for_folder inside volume_manager.VolumeManager and exposing it via the dbus and IPC interfaces. Corrects an earlier None/False issue that was failing on Linux.

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) wrote :

+1

review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Branch looks good!

Two minor nitpicks:

* Any reason to have this:

from ubuntuone.syncdaemon import config, event_queue, tritcask
from ubuntuone.syncdaemon import volume_manager

instead of:

from ubuntuone.syncdaemon import config, event_queue, tritcask, volume_manager

?

* Can you please add the docstring for this method?

def validate_path_for_folder(self, path):

* Shouldn't we call normpath(path) before checking if the path is inside the user home?

Tests are green in both OSes, yey! (except for bug #929546 which is not relevant to this branch)
Thanks!

review: Needs Fixing
lp://qastaging/~brian.curtin/ubuntuone-client/824252-validate-path-export updated
1189. By Brian Curtin

Address Natalia's review comments.
Rearranged import, added docstring, moved normpath call to earlier.

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

> Branch looks good!

rev 1189 makes the changes you suggested.

Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Looks great!

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