Merge lp:~verterok/ubuntuone-client/local_rescan-only-active-volumes into lp:ubuntuone-client

[Guillermo Gonzalez]

Avoid scaning "inactive" (unsubscribed UDFs) volumes during initial local rescan.

This branch fix local_rescan to not include inactive volumes in the initial scan.

[Natalia Bidart (nataliabidart)]

Nice going! Server tests and client tests all green.

review: Approve

[dobey (dobey)]

review: Approve

[John Lenton (chipaca)]

The attempt to merge lp:~verterok/ubuntuone-client/local_rescan-only-active-volumes into lp:ubuntuone-client failed.Below is the output from the failed tests.

Using saved parent location: bzr+ssh://bazaar.launchpad.net/~ubuntuone-control-tower/ubuntuone-storage-protocol/trunk/
No revisions to pull.
/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
(B testing autoconf2.50... not found.
  testing autoconf... found 2.65
checking for automake >= 1.10...
(B testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
(B testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
(B testing intltoolize... found 0.41.0
checking for pkg-config >= 0.14.0...
(B testing pkg-config... found 0.22
Checking for required M4 macros...
(BChecking for forbidden M4 macros...
(BProcessing ./configure.ac
(BRunning libtoolize...
(Blibtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
(BRunning aclocal-1.11...
(BRunning autoconf...
(BRunning autoheader...
(BRunning automake-1.11...
(BRunning ./configure --with-protocol=/home/john/canonical/ubuntuone-storage-protocol/trunk ...
(Bchecking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command li...

=== modified file 'tests/syncdaemon/test_localrescan.py'
--- tests/syncdaemon/test_localrescan.py	2010-03-26 15:00:11 +0000
+++ tests/syncdaemon/test_localrescan.py	2010-04-12 19:33:20 +0000
@@ -338,6 +338,25 @@
         d.addCallback(check)
         return d
 
+    @defer.inlineCallbacks
+    def test_start_with_udf_unsubscribed(self):
+        """LR start() having removed UDFs."""
+        unsub_vol = self.volumes.pop(0)
+        path_idx = self.expected.index(unsub_vol.path)
+        unsub_path = self.expected.pop(path_idx)
+        assert unsub_vol.path == unsub_path
+        self.fsm.vm.unsubscribe_udf(unsub_vol.volume_id)
+        toscan = []
+        def f():
+            """helper"""
+            for _, path, _, _, udfmode in self.lr._queue:
+                toscan.append(path)
+            return defer.succeed(None)
+
+        self.lr._queue_scan = f
+        yield self.lr.start()
+        self.assertEqual(self.expected, sorted(toscan))
+
 
 class TwistedBase(BaseTestCase):
     """Base class for twisted tests."""
 
=== modified file 'ubuntuone/syncdaemon/local_rescan.py'
--- ubuntuone/syncdaemon/local_rescan.py	2010-03-26 20:24:15 +0000
+++ ubuntuone/syncdaemon/local_rescan.py	2010-04-12 19:33:20 +0000
@@ -60,7 +60,7 @@
     def start(self):
         """Start the comparison."""
         log_info("start scan all volumes")
-        to_scan = self._get_volumes()
+        to_scan = self._get_volumes(all_volumes=False)
         for vol in to_scan:
             try:
                 mdobj = self.fsm.get_by_path(vol.path)
@@ -90,11 +90,11 @@
             log_info("unlink from trash: " + datalog)
             self.aq.unlink(share_id, parent_id, node_id)
 
-    def _get_volumes(self, access_level='Modify'):
+    def _get_volumes(self, all_volumes=True, access_level='Modify'):
         """Get all the shares and udfs matching access_level to compare."""
         modify = access_level == 'Modify'
         view = access_level == 'View'
-        for volume in self.vm.get_volumes(all_volumes=True):
+        for volume in self.vm.get_volumes(all_volumes=all_volumes):
             if (modify and volume.can_write()) or \
                (view and not volume.can_write()):
                 yield volume