Merge lp:~diegosarmentero/ubuntuone-client/menu-progress into lp:ubuntuone-client

[Diego Sarmentero]

- Fixing ipc signals in windows and changing deque size to 5

[Roberto Alsina (ralsina)]

review: Approve

[dobey (dobey)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-client/menu-progress 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.69
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.5
checking for libtool >= 1.5...
  testing libtoolize... found 2.4.2
checking for intltool >= 0.30...
  testing intltoolize... found 0.50.2
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.26
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.18
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... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking how to create a ustar tar archive... gnutar
checking whether make supports nested variables... 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 how to print strings... printf
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....

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-client/menu-progress 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.69
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.5
checking for libtool >= 1.5...
  testing libtoolize... found 2.4.2
checking for intltool >= 0.30...
  testing intltoolize... found 0.50.2
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.26
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.18
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... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking how to create a ustar tar archive... gnutar
checking whether make supports nested variables... 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 how to print strings... printf
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....

[lp:~diegosarmentero/ubuntuone-client/menu-progress]

1293. By Diego Sarmentero on 2012-08-20

fixing test

1294. By Diego Sarmentero on 2012-08-20

merge

=== modified file 'tests/status/test_aggregator.py'
--- tests/status/test_aggregator.py	2012-08-13 15:01:52 +0000
+++ tests/status/test_aggregator.py	2012-08-20 13:43:24 +0000
@@ -827,9 +827,10 @@
     def test_file_uploading(self):
         """Check that it returns a list with the path, size, and progress."""
         fc = FakeCommand(path='testfile.txt')
+        fc.size = 200
         self.status_frontend.upload_started(fc)
         uploading = self.status_frontend.files_uploading()
-        expected = [('testfile.txt', 0, 0)]
+        expected = [('testfile.txt', 200, 0)]
         self.assertEqual(uploading, expected)
         menu_data = self.listener.menu_data()
         self.assertEqual(menu_data,
@@ -1382,12 +1383,12 @@
         self.assertEqual(len(self.aggregator.recent_transfers), 1)
 
     def test_max_recent_files(self):
-        """Check that the queue doesn't exceed the 10 items."""
+        """Check that the queue doesn't exceed the 5 items."""
         for i in range(15):
             fc = FakeCommand()
             self.status_frontend.upload_started(fc)
             self.status_frontend.upload_finished(fc)
-        self.assertEqual(len(self.aggregator.recent_transfers), 10)
+        self.assertEqual(len(self.aggregator.recent_transfers), 5)
 
     def test_progress_made(self):
         """Progress on up and downloads is tracked."""

=== modified file 'ubuntuone/platform/ipc/ipc_client.py'
--- ubuntuone/platform/ipc/ipc_client.py	2012-08-13 14:34:36 +0000
+++ ubuntuone/platform/ipc/ipc_client.py	2012-08-20 13:43:24 +0000
@@ -250,7 +250,7 @@
         """Emit UploadFileProgress."""
 
     @signal
-    def on_upload_finished(self, upload, **info):
+    def on_upload_finished(self, upload, *info):
         """Emit UploadFinished."""
 
     @signal

=== modified file 'ubuntuone/platform/ipc/perspective_broker.py'
--- ubuntuone/platform/ipc/perspective_broker.py	2012-08-07 19:31:54 +0000
+++ ubuntuone/platform/ipc/perspective_broker.py	2012-08-20 13:43:24 +0000
@@ -305,7 +305,7 @@
         """Fire a signal to notify about a download progress."""
 
     @signal
-    def DownloadFinished(self, path, info):
+    def DownloadFinished(self, path, *info):
         """Fire a signal to notify that a download has finished."""
 
     @signal
@@ -317,7 +317,7 @@
         """Fire a signal to notify about an upload progress."""
 
     @signal
-    def UploadFinished(self, path, info):
+    def UploadFinished(self, path, *info):
         """Fire a signal to notify that an upload has finished."""
 
     @signal

=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2012-08-13 15:01:52 +0000
+++ ubuntuone/status/aggregator.py	2012-08-20 13:43:24 +0000
@@ -624,7 +624,7 @@
         self.finished_delay = 10
         self.progress = {}
         self.to_do = {}
-        self.recent_transfers = deque(maxlen=10)
+        self.recent_transfers = deque(maxlen=5)
 
     def get_notification(self):
         """Create a new toggleable notification object."""
@@ -816,8 +816,9 @@
         """Return a list with the files being uploading."""
         uploading = []
         for upload in self.aggregator.files_uploading:
-            uploading.append((upload.path, upload.size,
-                upload.n_bytes_written))
+            if upload.size != 0:
+                uploading.append((upload.path, upload.size,
+                    upload.n_bytes_written))
         return uploading
 
     def file_published(self, public_url):