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

[Guillermo Gonzalez]

Fix local rescan to handle the case of the stat in metadata being None and remove unused refrsh_stat methods.

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.

[Lucio Torre (lucio.torre)]

+1

review: Approve

[Facundo Batista (facundo)]

 ** Merging the branch
 M tests/syncdaemon/test_fsm.py
 M tests/syncdaemon/test_localrescan.py
 M ubuntuone/syncdaemon/filesystem_manager.py
 M ubuntuone/syncdaemon/local_rescan.py
 M ubuntuone/syncdaemon/sync.py
Text conflict in tests/syncdaemon/test_fsm.py
1 conflicts encountered.

review: Needs Fixing

[lp:~verterok/ubuntuone-client/fix-692496]

780. By Guillermo Gonzalez on 2011-01-04

merge with trunk

[Guillermo Gonzalez (verterok)]

merged with trunk & pushed.

[Facundo Batista (facundo)]

Like it!

review: Approve

[Lucio Torre (lucio.torre)]

re approve rs

review: Approve

=== modified file 'tests/syncdaemon/test_fsm.py'
--- tests/syncdaemon/test_fsm.py	2011-01-03 20:36:27 +0000
+++ tests/syncdaemon/test_fsm.py	2011-01-04 13:31:28 +0000
@@ -1486,25 +1486,6 @@
         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")

=== modified file 'tests/syncdaemon/test_localrescan.py'
--- tests/syncdaemon/test_localrescan.py	2011-01-03 18:08:27 +0000
+++ tests/syncdaemon/test_localrescan.py	2011-01-04 13:31:28 +0000
@@ -1590,7 +1590,9 @@
         # 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."""
@@ -2074,6 +2076,13 @@
         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."""

=== modified file 'ubuntuone/syncdaemon/filesystem_manager.py'
--- ubuntuone/syncdaemon/filesystem_manager.py	2011-01-03 20:36:27 +0000
+++ ubuntuone/syncdaemon/filesystem_manager.py	2011-01-04 13:31:28 +0000
@@ -779,14 +779,6 @@
         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)

=== modified file 'ubuntuone/syncdaemon/local_rescan.py'
--- ubuntuone/syncdaemon/local_rescan.py	2010-12-02 21:27:56 +0000
+++ ubuntuone/syncdaemon/local_rescan.py	2011-01-04 13:31:28 +0000
@@ -363,6 +363,8 @@
         - 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

=== modified file 'ubuntuone/syncdaemon/sync.py'
--- ubuntuone/syncdaemon/sync.py	2010-12-11 00:31:29 +0000
+++ ubuntuone/syncdaemon/sync.py	2011-01-04 13:31:28 +0000
@@ -200,16 +200,6 @@
         """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