Merge lp:~facundo/ubuntuone-client/fix-getbynodeid--1-6 into lp:ubuntuone-client/stable-1-6

[Facundo Batista]

Fix filter by share and path (LP: #807737).

Fix filter by share and path.

Avoid returning directories that had names starting with the one is asked.

Tests included

[John O'Brien (jdobrien)]

Looks good.

review: Approve

[Facundo Batista (facundo)]

Approving with one review.

review: Approve

=== modified file 'tests/syncdaemon/test_fsm.py'
--- tests/syncdaemon/test_fsm.py	2011-04-05 19:51:24 +0000
+++ tests/syncdaemon/test_fsm.py	2011-09-30 12:49:29 +0000
@@ -1382,6 +1382,9 @@
         path5 = os.path.join(share1.path, "c")
         mdid5 = self.fsm.create(path5, "share_id1")
         self.fsm.set_node_id(path5, "uuid5")
+        path9 = os.path.join(share1.path, "aaa")
+        mdid9 = self.fsm.create(path9, "share_id1")
+        self.fsm.set_node_id(path9, "uuid9")
 
         # create some nodes in share 2
         path6 = os.path.join(share2.path, "a")
@@ -1402,6 +1405,7 @@
         self.assertTrue(mdid3 in all)
         self.assertTrue(mdid4 in all)
         self.assertTrue(mdid5 in all)
+        self.assertTrue(mdid9 in all)
         self.assertTrue(mdid6 not in all)
         self.assertTrue(mdid7 not in all)
         self.assertTrue(mdid8 not in all)
@@ -1412,6 +1416,7 @@
         self.assertTrue(mdid3 not in all)
         self.assertTrue(mdid4 not in all)
         self.assertTrue(mdid5 not in all)
+        self.assertTrue(mdid9 not in all)
         self.assertTrue(mdid6 in all)
         self.assertTrue(mdid7 in all)
         self.assertTrue(mdid8 in all)
@@ -1426,6 +1431,7 @@
         self.assertTrue(mdid6 not in all)
         self.assertTrue(mdid7 not in all)
         self.assertTrue(mdid8 not in all)
+        self.assertTrue(mdid9 not in all)
 
     @defer.inlineCallbacks
     def test_get_all_by_share_mixed(self):
 
=== modified file 'tests/syncdaemon/test_localrescan.py'
--- tests/syncdaemon/test_localrescan.py	2011-04-05 19:33:06 +0000
+++ tests/syncdaemon/test_localrescan.py	2011-09-30 12:49:29 +0000
@@ -886,6 +886,7 @@
         sh1 = self.create_node("a/b", is_dir=True)
         sh2 = self.create_node("a/b/c", is_dir=True)
         sh3 = self.create_node("a/b/c/d", is_dir=False)
+        self.create_node(os.path.join("a", "bar"), is_dir=False)
 
         # remove the whole subtree
         shutil.rmtree(sh1)
 
=== modified file 'ubuntuone/syncdaemon/filesystem_manager.py'
--- ubuntuone/syncdaemon/filesystem_manager.py	2011-04-05 19:51:24 +0000
+++ ubuntuone/syncdaemon/filesystem_manager.py	2011-09-30 12:49:29 +0000
@@ -710,16 +710,19 @@
                   path, mdobj['mdid'], share_id, node_id)
 
     def get_mdobjs_by_share_id(self, share_id, base_path=None):
-        """Returns all the mdobj that belongs to a share and it path
-        startswith base_path.
+        """Get all the mdobjs from a share.
+
+        If base_path is present, only return those who start with (or
+        are equal to) that path.
         """
         if base_path is None:
             base_path = self._get_share(share_id).path
+        compare_path = base_path + os.path.sep
+
         all_mdobjs = []
         # filter by path first, so we don't touch disk
-        for path in self._idx_path:
-            if path.startswith(base_path):
-                mdid = self._idx_path[path]
+        for path, mdid in self._idx_path.iteritems():
+            if path == base_path or path.startswith(compare_path):
                 mdobj = self.fs[mdid]
                 if mdobj["share_id"] == share_id:
                     all_mdobjs.append(_MDObject(**mdobj))