Merge lp:~mandel/ubuntuone-client/better-encoding into lp:ubuntuone-client

[Manuel de la Peña]

- Removed test that makes no sense (LP: #1016459).
- Implement the os_helper methods that return file names to the sd so that they use the correct encoding (LP: #1015672).

- Removed test that makes no sense (LP: #1016459).
- Implement the os_helper methods that return file names to the sd so that they use the correct encoding (LP: #1015672).

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[dobey (dobey)]

136 + return unicodedata.normalize('NFC', unicode(path, 'utf-8')).encode('utf-8')

I think this probably needs to be path.decode('utf-8') instead of using unicode(), just to make life a little easier, one line at a time, when we have to make it work on Python 3.x. :)

[Alejandro J. Cura (alecu)]

_build_invalid_darwin_path_name should be a constant instead.

Otherwise the branch looks ok.

review: Needs Fixing

[Alejandro J. Cura (alecu)]

+1

review: Approve

[Alejandro J. Cura (alecu)]

== Python Lint Notices ==

./tests/platform/os_helper/test_darwin.py:
    40: 'set_application_name' imported but unused

review: Needs Fixing

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~mandel/ubuntuone-client/better-encoding 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 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... yes
checking whether the shell understands "+="... yes
ch...

[lp:~mandel/ubuntuone-client/better-encoding]

1266. By Manuel de la Peña on 2012-06-26

Fix lint issue.

[Alejandro J. Cura (alecu)]

+1

review: Approve

=== modified file 'tests/platform/os_helper/test_darwin.py'
--- tests/platform/os_helper/test_darwin.py	2012-05-17 12:23:12 +0000
+++ tests/platform/os_helper/test_darwin.py	2012-06-26 10:58:37 +0000
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 # tests.platform.os_helper - darwin platform tests
 #
 # Copyright 2012 Canonical Ltd.
@@ -39,18 +40,22 @@
 from ubuntuone.platform import (
     move_to_trash,
     open_file,
-    set_application_name,
     stat_path,
 )
 
+DARWIN_TEST_FILE_NAME = u'naïve_test_file'
+
 
 class OSWrapperTests(test_os_helper.OSWrapperTests):
     """Tests for os wrapper functions."""
 
     @defer.inlineCallbacks
-    def setUp(self):
+    def setUp(self, test_dir_name=None, test_file_name=None,
+              valid_file_path_builder=None):
         """Set up."""
-        yield super(OSWrapperTests, self).setUp()
+        yield super(OSWrapperTests, self).setUp(
+            test_dir_name=test_dir_name, test_file_name=test_file_name,
+            valid_file_path_builder=None)
         self.handler = MementoHandler()
         self.handler.setLevel(logging.DEBUG)
         self._logger = logging.getLogger('ubuntuone.SyncDaemon')
@@ -74,10 +79,6 @@
         self.assertNotEqual(os.stat(link).st_ino, stat_path(link).st_ino)
         self.assertEqual(os.lstat(link).st_ino, stat_path(link).st_ino)
 
-    def test_set_application_name(self):
-        """Check that the implementation of set_application_name fails."""
-        self.assertRaises(Exception, set_application_name, "test")
-
     def test_movetotrash_file_bad(self):
         """Something bad happen when moving to trash, removed anyway."""
         path = os.path.join(self.basedir, 'foo')
@@ -102,3 +103,59 @@
         self.assertFalse(os.path.exists(path))
         self.assertTrue(self.handler.check_warning("Problems moving to trash!",
                                                    "Removing anyway", "foo"))
+
+
+class TestIllegalPaths(OSWrapperTests):
+    """Test all the operations using illegal paths."""
+
+    @defer.inlineCallbacks
+    def setUp(self, test_dir_name=None, test_file_name=None,
+              valid_file_path_builder=None):
+        """Set up for the tests."""
+        test_file_name = DARWIN_TEST_FILE_NAME
+        yield super(TestIllegalPaths, self).setUp(
+            test_dir_name=test_dir_name, test_file_name=test_file_name)
+
+    def test_listdir(self, expected_result=None):
+        """Return a list of the files in a dir."""
+        _, valid_path_name = os.path.split(self.valid_path)
+        expected_result = [valid_path_name.encode('utf-8')]
+        super(TestIllegalPaths, self).test_listdir(expected_result)
+
+    def _assert_read_link(self, target):
+        """Assert if the target path of the link is correct."""
+        destination = os.path.join(self.basedir, target)
+        darwin.make_link(self.testfile, destination)
+
+        target = darwin.read_link(destination)
+        self.assertEqual(self.testfile.encode('utf-8'), target)
+
+    def test_make_link(self):
+        """The link is properly made."""
+        destination = os.path.join(self.basedir, 'destination')
+        darwin.make_link(self.testfile, destination)
+
+        self.assertTrue(darwin.is_link(destination))
+        self.assertEqual(self.testfile.encode('utf-8'),
+                         darwin.read_link(destination))
+
+
+class TestIllegalPathsWalk(test_os_helper.WalkTests):
+    """Tests for os wrapper functions."""
+
+    @defer.inlineCallbacks
+    def setUp(self, test_dir_name=None, test_file_name=None,
+              valid_file_path_builder=None, valid_file_name_builder=None):
+        """Setup for the tests."""
+        test_file_name = DARWIN_TEST_FILE_NAME
+        yield super(TestIllegalPathsWalk, self).setUp(
+            test_dir_name=test_dir_name, test_file_name=test_file_name)
+
+    def test_top_down(self, topdown=True, expected=None):
+        """Walk the tree top-down."""
+        result = os.walk(self.basedir, topdown)
+        expected = self._build_dict_from_walk(result,
+            path_transformer=darwin.get_syncdaemon_valid_path,
+            name_transformer=darwin.get_syncdaemon_valid_path)
+        super(TestIllegalPathsWalk, self).test_top_down(topdown=topdown,
+                                                        expected=expected)

=== modified file 'ubuntuone/platform/os_helper/darwin.py'
--- ubuntuone/platform/os_helper/darwin.py	2012-06-19 14:57:19 +0000
+++ ubuntuone/platform/os_helper/darwin.py	2012-06-26 10:58:37 +0000
@@ -37,6 +37,7 @@
 import logging
 import os
 import shutil
+import unicodedata
 
 from ubuntuone.platform.os_helper import unix
 
@@ -61,11 +62,8 @@
 native_rename = unix.native_rename
 recursive_move = unix.recursive_move
 make_link = unix.make_link
-read_link = unix.read_link
 is_link = unix.is_link
 remove_link = unix.remove_link
-listdir = unix.listdir
-walk = unix.walk
 access = unix.access
 can_write = unix.can_write
 stat_path = unix.stat_path
@@ -108,3 +106,27 @@
 def set_application_name(app_name):
     """Set the name of the application."""
     # nothing to be done let the plist take care of it
+
+def get_syncdaemon_valid_path(path):
+    """Get a 'darwin' path and modify it so that it can be used in sd."""
+    return unicodedata.normalize('NFC', path.decode('utf-8')).encode('utf-8')
+
+
+def read_link(path):
+    """Read the destination of a link."""
+    destination = os.readlink(path)
+    return get_syncdaemon_valid_path(destination)
+
+
+def listdir(directory):
+    """List a directory."""
+    return map(get_syncdaemon_valid_path, os.listdir(directory))
+
+
+def walk(path, topdown=True):
+    """Walk a dir."""
+    for dirpath, dirnames, filenames in os.walk(path, topdown):
+        dirpath = get_syncdaemon_valid_path(dirpath)
+        dirnames = map(get_syncdaemon_valid_path, dirnames)
+        filenames = map(get_syncdaemon_valid_path, filenames)
+        yield dirpath, dirnames, filenames

=== modified file 'ubuntuone/platform/os_helper/unix.py'
--- ubuntuone/platform/os_helper/unix.py	2012-05-17 11:57:49 +0000
+++ ubuntuone/platform/os_helper/unix.py	2012-06-26 10:58:37 +0000
@@ -153,6 +153,7 @@
 
 
 def walk(path, topdown=True):
+    """Walk a dir."""
     return os.walk(path, topdown)