Ubuntu One Client

Merge lp:~verterok/ubuntuone-client/fix-692496-stable-1-4 into lp:ubuntuone-client/stable-1-4

fix-692496-stable-1-4
Merge into stable-1-4

Proposed by Guillermo Gonzalez on 2010-12-20

Status:

Merged

Approved by:

dobey on 2011-01-06

Approved revision:

743

Merged at revision:

745

Proposed branch:

lp:~verterok/ubuntuone-client/fix-692496-stable-1-4

Merge into:

lp:ubuntuone-client/stable-1-4

Diff against target:

136 lines (+21/-40)

5 files modified

tests/syncdaemon/test_fsm.py (+9/-21)
tests/syncdaemon/test_localrescan.py (+10/-1)
ubuntuone/syncdaemon/filesystem_manager.py (+0/-8)
ubuntuone/syncdaemon/local_rescan.py (+2/-0)
ubuntuone/syncdaemon/sync.py (+0/-10)

To merge this branch:

bzr merge lp:~verterok/ubuntuone-client/fix-692496-stable-1-4

Related bugs:

Bug #692496: Ubuntu one crashes in scan()

Medium

Fix Released

Link a bug report

Reviewer	Date Requested	Status
dobey (community)		Approve on 2011-01-06
Facundo Batista (community)	2010-12-20	Approve on 2011-01-04
Review via email: mp+44273@code.launchpad.net

Commit message

Fix local rescan to handle the case of the stat in metadata being None.

Description of the change

This branch fix local rescan to handle the case of the stat in metadata being None, also remove the unused refresh_stat methods from fsm and sync.

Revision history for this message

Facundo Batista (facundo) wrote on 2011-01-04:

review: Approve

Revision history for this message

dobey (dobey) on 2011-01-06:

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Guillermo Gonzalez

Ubuntu One hackers

         mdobj = self.fsm.get_by_mdid(mdid)
         return mdobj
+    def refresh_stat(self, fsm, path):
+        """Refresh the stat of a md object."""
+        mdid = fsm._idx_path[path]
+        mdobj = fsm.fs[mdid]
+        mdobj["stat"] = os.lstat(path)
+        fsm.fs[mdid] = mdobj
 class StartupTests(unittest.TestCase):
     """Test the basic startup behaviour."""
         fsm.set_node_id(path2, "uuid2")
         self.assertTrue(os.path.exists(fsm.fs.key_file(mdid1+'.old')))
         self.assertTrue(os.path.exists(fsm.fs.key_file(mdid2+'.old')))
-        fsm.refresh_stat(path1)
+        self.refresh_stat(fsm, path1)
-        fsm.refresh_stat(path2)
+        self.refresh_stat(fsm, path2)
         self.assertTrue(os.path.exists(self.fsm.fs.key_file(mdid1+'.old')))
         self.assertTrue(os.path.exists(self.fsm.fs.key_file(mdid2+'.old')))
         # break the second node on purpose but with an invalid pickle
         mdobj = self.create_node("thisdir")
         self.assertEqual(mdobj.stat, os.stat(path))
-    def test_refresh(self):
-        """Test that refresh_stat works."""
-        path = os.path.join(self.share.path, "thisfile")
-        open(path, "w").close()
-        mdobj = self.create_node("thisfile")
-        mdid = mdobj.mdid
-        oldstat = os.stat(path)
-        self.assertEqual(mdobj.stat, oldstat)
-        # touch the file, it's not automagically updated
-        open(path, "w").close()
-        mdobj = self.fsm.get_by_mdid(mdid)
-        self.assertEqual(mdobj.stat, oldstat)
-        # it's updated when asked
-        self.fsm.refresh_stat(path)
-        mdobj = self.fsm.get_by_mdid(mdid)
-        self.assertEqual(mdobj.stat, os.stat(path))
     def test_commit_partial(self):
         """Test that it's updated in the commit."""
         path = os.path.join(self.share.path, "thisfile")
         # start a put file, and assume we got interrupted (no server hash)
         pathhash = self._hash(path)
         self.fsm.set_by_mdid(mdid, local_hash=pathhash, crc32='foo')
-        self.fsm.refresh_stat(path)
+        mdobj = self.fsm.fs[mdid]
+        mdobj["stat"] = os.lstat(path)
+        self.fsm.fs[mdid] = mdobj
         def check(_):
             """Compare predictable args, and check fh factory."""
         self.startTest(check)
         return self.deferred
+    def test_check_stat_None(self):
+        """Test check_stat with oldstat = None."""
+        # create the file in metadata
+        path = os.path.join(self.share.path, "a_file")
+        self.fsm.create(path, self.share.volume_id, is_dir=False)
+        self.assertTrue(self.lr.check_stat(path, None))
 class RootBadStateTests(TwistedBase):
     """Test what happens with volume roots left in a bad state last time."""
         mdid = self._idx_node_id[(share_id, node_id)]
         self.set_by_mdid(mdid, **kwargs)
-    def refresh_stat(self, path):
-        """Refresh the stat of a md object."""
-        log_debug("refresh stat to path=%r", path)
-        mdid = self._idx_path[path]
-        mdobj = self.fs[mdid]
-        mdobj["stat"] = get_stat(path)
-        self.fs[mdid] = mdobj
     def move_file(self, new_share_id, path_from, path_to):
         """Move a file/dir from one point to the other."""
         path_from = os.path.normpath(path_from)
         - st_size: it changed in size, surely different content
         - st_mtime: the content could be different even having the same size
         """
+        if oldstat is None:
+            return True
         newstat = os.stat(fullname)
         different = (newstat.st_ino != oldstat.st_ino or
                      newstat.st_size != oldstat.st_size or
         """Move file to conflict."""
         self.fs.move_to_conflict(self.get_mdid())
-    def refresh_stat(self):
-        """Refresh the stat."""
-        path = self["path"]
-        # pylint: disable-msg=W0704
-        try:
-            self.fs.refresh_stat(path)
-        except OSError:
-            # no file to stat, nothing to do
-            pass
     def safe_get(self, key, default='^_^'):
         """Safe version of self.get, to be used in the FileLogger."""
         # catch all errors as we are here to help logging