Merge lp:~ralsina/ubuntuone-client/verify-harder into lp:ubuntuone-client

[Roberto Alsina]

 - Added check for UDF path not being a file (LP:1033582).

 - Added check for UDF path not being a file (LP:1033582).

[Eric Casteleijn (thisfred)]

+2

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Alejandro J. Cura (alecu)]

Looks good

review: Approve

=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2012-04-09 20:07:05 +0000
+++ tests/syncdaemon/test_vm.py	2012-08-06 19:21:20 +0000
@@ -2752,7 +2752,7 @@
 
         result, msg = self.vm.validate_path_for_folder(folder_path)
         self.assertTrue(result)
-        self.assertIs(msg, "", 
+        self.assertIs(msg, "",
             '%r must be a valid path for creating a folder.' % folder_path)
 
     def test_validate_UDF_path_if_folder_shares_a_prefix_with_an_udf(self):
@@ -2769,7 +2769,7 @@
 
         result, msg = self.vm.validate_path_for_folder(tricky_path)
         self.assertTrue(result)
-        self.assertIs(msg, "", 
+        self.assertIs(msg, "",
             '%r must be a valid path for creating a folder.' % tricky_path)
 
     def test_validate_UDF_path_not_valid_if_outside_home(self):
@@ -2818,6 +2818,17 @@
         self.assertIsNot(msg, "",
             '%r must be an invalid path for creating a folder.' % udf_parent)
 
+    def test_not_valid_if_folder_is_file(self):
+        """A link path is not valid."""
+        self.patch(volume_manager.os.path, 'isdir', lambda p: False)
+        self.patch(volume_manager, 'path_exists', lambda p: True)
+        path_link = os.path.join(self.home_dir, 'Test Me')
+
+        result, msg = self.vm.validate_path_for_folder(path_link)
+        self.assertFalse(result)
+        self.assertIsNot(msg, "",
+            '%r must be an invalid path for creating a folder.' % path_link)
+
     def test_not_valid_if_folder_is_link(self):
         """A link path is not valid."""
         self.patch(volume_manager, 'is_link', lambda p: True)
 
=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2012-05-14 21:24:24 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2012-08-06 19:21:20 +0000
@@ -1207,6 +1207,10 @@
         if is_link(path):
             return (False, "UDFs can not be a symlink")
 
+        # check if path exists but is not a directory
+        if path_exists(path) and not os.path.isdir(path):
+            return (False, "The path exists but is not a folder")
+
         # check if the path it's ok (outside root and
         # isn't a ancestor or child of another UDF)
         if self._is_nested_udf(path):