Merge lp:~mandel/ubuntuone-client/donot-add-watches-parents into lp:ubuntuone-client

[Manuel de la Peña]

Fixes Lp:838111

Adds a platform dependent flag that lets synd-daemon know if the parents of the UDF should be watched or not according to the platform.

Fixes Lp:838111

Adds a platform dependent flag that lets synd-daemon know if the parents of the UDF should be watched or not according to the platform.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

We will not be adding a new module to define constant.

We talked with Manuel and Facundo about this, and we're using the __init__.py modules in platform to do this.

review: Needs Fixing

[Manuel de la Peña (mandel)]

After mumble conversations this branch is rejected so that a nicer and more secure internal API is used.

review: Disapprove

Unmerged revisions

1123. By Manuel de la Peña on 2011-09-01

Link bug.

1122. By Manuel de la Peña on 2011-09-01

Added a flag that is created per platform that decides if wathces should be added to the parent of a UDF.

=== modified file 'tests/syncdaemon/test_localrescan.py'
--- tests/syncdaemon/test_localrescan.py	2011-08-30 18:04:23 +0000
+++ tests/syncdaemon/test_localrescan.py	2011-09-01 10:32:23 +0000
@@ -2260,7 +2260,8 @@
         self._logger = logging.getLogger('ubuntuone.SyncDaemon')
         self._logger.addHandler(self.handler)
         self.addCleanup(self._logger.removeHandler, self.handler)
-
+       
+    @skipIfOS('win32', 'This is a linux specific test.')
     @defer.inlineCallbacks
     def test_ancestors_have_watch(self):
         """UDF's ancestors have a watch."""
@@ -2277,6 +2278,24 @@
         self.assertTrue(self.handler.check_debug("Adding watch to UDF's",
                                                  repr(self.ancestors[0])))
 
+    @skipIfOS('linux2', 'This is a windows specific test.')
+    @defer.inlineCallbacks
+    def test_ancestors_do_not_have_watch(self):
+        """UDF's ancestors have a watch."""
+        yield self.lr.start()
+
+        expected = set(self.ancestors)
+        actual = set(self.watches)
+        difference = expected.symmetric_difference(actual)
+        msg = 'Expected (%s)\n\n' \
+              'Is  subset of real watches (%s).\n\n' \
+              'Set symmetric difference is: %s.' % \
+               (expected, actual, difference)
+        self.assertFalse(expected.issubset(actual), msg)
+        self.assertFalse(self.handler.check_debug("Adding watch to UDF's",
+                                                 repr(self.ancestors[0])))
+
+
     @defer.inlineCallbacks
     def test_watch_is_not_added_if_present(self):
         """Watches are not added if present."""

=== modified file 'ubuntuone/platform/__init__.py'
--- ubuntuone/platform/__init__.py	2011-08-16 13:44:20 +0000
+++ ubuntuone/platform/__init__.py	2011-09-01 10:32:23 +0000
@@ -10,6 +10,7 @@
     from ubuntuone.platform import linux
     source = linux
 
+from ubuntuone.platform import local_rescan
 from ubuntuone.platform import credentials
 
 target = sys.modules[__name__]

=== added file 'ubuntuone/platform/local_rescan.py'
--- ubuntuone/platform/local_rescan.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/local_rescan.py	2011-09-01 10:32:23 +0000
@@ -0,0 +1,25 @@
+# ubuntuone.platform.local_rescan
+#
+# Author: Manuel de la Pena <[e-mail]> 
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""Platform specific local rescan code."""
+import sys
+
+# import the correct code from the package
+if sys.platform == 'win32':
+    watch_ancestors = False
+else:
+    watch_ancestors = True 

=== modified file 'ubuntuone/syncdaemon/local_rescan.py'
--- ubuntuone/syncdaemon/local_rescan.py	2011-08-22 14:20:30 +0000
+++ ubuntuone/syncdaemon/local_rescan.py	2011-09-01 10:32:23 +0000
@@ -38,7 +38,7 @@
     rename,
     stat_path,
 )
-
+from ubuntuone.platform.local_rescan import watch_ancestors 
 
 class ScanTransactionDirty(Exception):
     """The transaction was dirty."""
@@ -271,7 +271,6 @@
             m = "Unsubscribing UDF %r because not in disk: %r"
             log_info(m, volume.volume_id, volume.path)
             self.vm.unsubscribe_udf(volume.volume_id)
-
         for ancestor in volume.ancestors:
             # check that ancestor is still there
             if not access(ancestor):
@@ -311,7 +310,7 @@
             try:
                 # add watches to UDF ancestors and check UDF is ok
                 volume = scan_info[0]
-                if isinstance(volume, volume_manager.UDF):
+                if isinstance(volume, volume_manager.UDF) and watch_ancestors:
                     udf_ok = yield self._add_watches_to_udf_ancestors(volume)
                     if not udf_ok:
                         self._process_next_queue(None)