Merge lp:~thisfred/ubuntuone-client/fix-stale-notification-1-6 into lp:ubuntuone-client/stable-1-6

[Eric Casteleijn]

Uploading filename is now reset on every message display.

Uploading filename is now reset on every message display.

[John O'Brien (jdobrien)]

nice fixes to use basename instead of home-grown splitting.

review: Approve

[dobey (dobey)]

This seems to be causing a UnicodeDecodeError inside tarmac.

[Eric Casteleijn (thisfred)]

Is there a traceback?

[dobey (dobey)]

Yes. But the error is happening inside tarmac. Perhaps a file with a unicode name got left around, and is then causing shutil.rmtree() to fail with UnicodeDecodeError, when locale is unset.

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~thisfred/ubuntuone-client/fix-stale-notification-1-6 into lp:ubuntuone-client/stable-1-6 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.17
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 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... o...

Unmerged revisions

974. By Eric Casteleijn on 2011-12-14

backport of fix for #807005

973. By Eric Casteleijn on 2011-12-14

unchanged: attach bug

=== modified file 'tests/status/test_aggregator.py'
--- tests/status/test_aggregator.py	2011-04-20 02:50:23 +0000
+++ tests/status/test_aggregator.py	2011-12-14 21:47:23 +0000
@@ -1276,6 +1276,26 @@
         result = self.aggregator.get_discovery_message()
         self.assertEqual(expected, result)
 
+    def test_get_discovery_message_clears_filenames(self):
+        """Test the message that's shown on the discovery bubble."""
+        uploading = 10
+        downloading = 8
+        filename = 'upfile0.ext'
+        filename2 = 'downfile0.ext'
+        self.aggregator.files_uploading.extend([
+            FakeCommand(path='upfile%d.ext' % n) for n in range(uploading)])
+        self.aggregator.uploading_filename = filename
+        self.aggregator.files_downloading.extend([
+            FakeCommand(path='downfile%d.ext' % n) for n in
+            range(downloading)])
+        self.aggregator.downloading_filename = 'STALE FILENAME'
+        self.aggregator.uploading_filename = 'STALE FILENAME'
+        expected = (
+            aggregator.files_being_uploaded(filename, uploading) + "\n" +
+            aggregator.files_being_downloaded(filename2, downloading))
+        result = self.aggregator.get_discovery_message()
+        self.assertEqual(expected, result)
+
     def test_get_final_status_message(self):
         """The final status message."""
         done = (5, 10)
 
=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2011-04-12 20:41:55 +0000
+++ ubuntuone/status/aggregator.py	2011-12-14 21:47:23 +0000
@@ -662,12 +662,14 @@
         lines = []
         files_uploading = len(self.files_uploading)
         if files_uploading > 0:
+            self.uploading_filename = os.path.basename(
+                self.files_uploading[0].path)
             lines.append(files_being_uploaded(
                 self.uploading_filename, files_uploading))
         files_downloading = len(self.files_downloading)
         if files_downloading > 0:
-            self.downloading_filename = self.files_downloading[0].path.split(
-                os.path.sep)[-1]
+            self.downloading_filename = os.path.basename(
+                self.files_downloading[0].path)
             lines.append(files_being_downloaded(
                 self.downloading_filename, files_downloading))
         return "\n".join(lines)
@@ -724,8 +726,8 @@
         self.total_counter += 1
         # pylint: disable=W0201
         if not self.downloading_filename:
-            self.downloading_filename = self.files_downloading[0].path.split(
-                os.path.sep)[-1]
+            self.downloading_filename = os.path.basename(
+                self.files_downloading[0].path)
         # pylint: enable=W0201
         self.update_progressbar()
         logger.debug("queueing command (%d/%d): %s", self.done_counter,
@@ -752,8 +754,8 @@
         self.total_counter += 1
         # pylint: disable=W0201
         if not self.uploading_filename:
-            self.uploading_filename = self.files_uploading[0].path.split(
-                os.path.sep)[-1]
+            self.uploading_filename = os.path.basename(
+                self.files_uploading[0].path)
         # pylint: enable=W0201
         self.update_progressbar()
         logger.debug("queueing command (%d/%d): %s", self.done_counter,