Merge lp:~alecu/ubuntuone-client/zero-steps into lp:ubuntuone-client

[Alejandro J. Cura]

Queue Done timer is now stopped and cleaned up when new downloads/uploads are queued (LP: #759084)

Queue Done timer is now stopped and cleaned up when new downloads/uploads are queued (LP: #759084)

[dobey (dobey)]

review: Approve

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~alecu/ubuntuone-client/zero-steps into lp:ubuntuone-client failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.16
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: 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...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking 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... i686-pc-linux-gnu
checking host system type... i686-pc-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 line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries.....

=== modified file 'tests/status/test_aggregator.py'
--- tests/status/test_aggregator.py	2011-04-07 15:53:31 +0000
+++ tests/status/test_aggregator.py	2011-04-12 20:45:29 +0000
@@ -1202,6 +1202,7 @@
         self.assertEqual(self.aggregator.done_counter, 0)
         self.assertEqual(len(self.aggregator.files_uploading), 0)
         self.assertEqual(len(self.aggregator.files_downloading), 0)
+        self.assertIs(self.aggregator.queue_done_timer, None)
 
     def assertMiscCommandQueued(self, fc):
         """Assert that some command was queued."""
@@ -1375,6 +1376,34 @@
         self.assertEqual(0.0, self.aggregator.progress_bar.progress)
         self.assertFalse(self.aggregator.progress_bar.visible)
 
+    def test_download_started_cancels_timer(self):
+        """Starting a download cancels the queue_done timer."""
+        fc = FakeCommand()
+        self.status_frontend.download_started(fc)
+        self.aggregator.clock.advance(self.aggregator.finished_delay)
+        self.status_frontend.download_finished(fc)
+        self.aggregator.queue_done()
+        self.aggregator.clock.advance(self.aggregator.finished_delay / 2)
+        fc2 = FakeCommand()
+        self.status_frontend.download_started(fc2)
+        self.assertIs(self.aggregator.queue_done_timer, None)
+        self.aggregator.clock.advance(self.aggregator.finished_delay)
+        self.status_frontend.download_finished(fc2)
+
+    def test_upload_started_cancels_timer(self):
+        """Starting an upload cancels the queue_done timer."""
+        fc = FakeCommand()
+        self.status_frontend.upload_started(fc)
+        self.aggregator.clock.advance(self.aggregator.finished_delay)
+        self.status_frontend.upload_finished(fc)
+        self.aggregator.queue_done()
+        self.aggregator.clock.advance(self.aggregator.finished_delay / 2)
+        fc2 = FakeCommand()
+        self.status_frontend.upload_started(fc2)
+        self.assertIs(self.aggregator.queue_done_timer, None)
+        self.aggregator.clock.advance(self.aggregator.finished_delay)
+        self.status_frontend.upload_finished(fc2)
+
 
 class StatusGrouperTestCase(TestCase):
     """Tests for the group_statuses function."""

=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2011-04-07 15:53:31 +0000
+++ ubuntuone/status/aggregator.py	2011-04-12 20:45:29 +0000
@@ -645,6 +645,7 @@
         self.downloading_filename = ''
         if self.queue_done_timer is not None:
             self.queue_done_timer.cleanup()
+            self.queue_done_timer = None
 
         if self.file_discovery_bubble:
             self.file_discovery_bubble.cleanup()
@@ -716,7 +717,8 @@
     def download_started(self, command):
         """A download just started."""
         if self.queue_done_timer is not None:
-            self.queue_done_timer.reset()
+            self.queue_done_timer.cleanup()
+            self.queue_done_timer = None
         self.files_downloading.append(command)
         self.download_total += 1
         self.total_counter += 1
@@ -743,7 +745,8 @@
     def upload_started(self, command):
         """An upload just started."""
         if self.queue_done_timer is not None:
-            self.queue_done_timer.reset()
+            self.queue_done_timer.cleanup()
+            self.queue_done_timer = None
         self.files_uploading.append(command)
         self.upload_total += 1
         self.total_counter += 1