Merge lp:~diegosarmentero/ubuntuone-client/publish-file into lp:ubuntuone-client

[Diego Sarmentero]

- Decoding path for comparison (LP: #998079).

[Roberto Alsina (ralsina)]

review: Approve

[Mike McCracken (mikemc)]

review: Approve

=== modified file 'tests/platform/test_tools.py'
--- tests/platform/test_tools.py	2012-04-09 20:07:05 +0000
+++ tests/platform/test_tools.py	2012-05-30 15:42:25 +0000
@@ -691,6 +691,36 @@
         self.assertEqual('http://example.com', file_info['public_url'])
 
     @defer.inlineCallbacks
+    def test_change_public_access_with_unicode(self):
+        """Test change_public_access."""
+        # XXX: change public access is the only class that expects uuid's as
+        # params this may indicate that we need to refactor that class to be
+        # consistent with the rest of syncdaemon where ID's are always strings
+        node_id = '59809aae-9c5a-47e0-b37c-5abbfbe7c50a'
+        share_id = ""
+        path = os.path.join(self.root_dir, u"ñoño")
+        path = path.encode('utf-8')
+        self.fs.create(path, "")
+        self.fs.set_node_id(path, node_id)
+
+        def change_public_access(share_id, node_id, is_public):
+            """Fake change_public_access"""
+            self.main.event_q.push("AQ_CHANGE_PUBLIC_ACCESS_OK",
+                                   share_id=share_id, node_id=node_id,
+                                   is_public=True,
+                                   public_url='http://example.com')
+        self.patch(self.main.action_q, 'change_public_access',
+                   change_public_access)
+
+        file_info = yield self.tool.change_public_access(path, True)
+
+        self.assertEqual(path.decode('utf-8'), file_info['path'])
+        self.assertEqual(share_id, file_info['share_id'])
+        self.assertEqual(node_id, file_info['node_id'])
+        self.assertEqual('True', file_info['is_public'])
+        self.assertEqual('http://example.com', file_info['public_url'])
+
+    @defer.inlineCallbacks
     def test_get_public_files(self):
         """Get the public files."""
         node_id = '59809aae-9c5a-47e0-b37c-5abbfbe7c50a'

=== modified file 'ubuntuone/platform/tools/__init__.py'
--- ubuntuone/platform/tools/__init__.py	2012-05-24 09:43:19 +0000
+++ ubuntuone/platform/tools/__init__.py	2012-05-30 15:42:25 +0000
@@ -480,9 +480,9 @@
     def change_public_access(self, path, is_public):
         """Change the public access for a given path."""
         d = self.wait_for_signals(
-                'PublicAccessChanged', 'PublicAccessChangeError',
-                success_filter=lambda info: info['path'] == path,
-                error_filter=lambda info, _: info['path'] == path)
+            'PublicAccessChanged', 'PublicAccessChangeError',
+            success_filter=lambda info: info['path'] == path.decode('utf-8'),
+            error_filter=lambda info, _: info['path'] == path.decode('utf-8'))
 
         metadata = yield self.get_metadata(path)
         args = (metadata['share_id'], metadata['node_id'], is_public)