Merge lp:~diegosarmentero/ubuntuone-client/fix-tests-jenkins into lp:ubuntuone-client

[Diego Sarmentero]

- Move the search_files method to the correct class (LP: #1070991).

[lp:~diegosarmentero/ubuntuone-client/fix-tests-jenkins]

1353. By Diego Sarmentero on 2012-10-25

docstring updated

1354. By Diego Sarmentero on 2012-10-25

removing commented code

[Mike McCracken (mikemc)]

Works for me. Note that this branch also fixes the control-panel IPC for windows/darwin, not just the jenkins tests.

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'ubuntuone/platform/ipc/ipc_client.py'
--- ubuntuone/platform/ipc/ipc_client.py	2012-10-23 14:15:54 +0000
+++ ubuntuone/platform/ipc/ipc_client.py	2012-10-25 17:30:28 +0000
@@ -213,10 +213,6 @@
          * int: bytes written
         """
 
-    @remote
-    def search_files(self, name):
-        """Returns a list of the files that contain name in the path."""
-
     @signal
     def on_content_queue_changed(self):
         """Emit ContentQueueChanged."""
@@ -373,6 +369,10 @@
     def get_dirty_nodes(self):
         """Rerturn a list of dirty nodes."""
 
+    @remote
+    def search_files(self, pattern):
+        """Returns a list of the files that matches this pattern."""
+
 
 class SharesClient(RemoteClient, Referenceable):
     """A ipc interface to interact with shares."""

=== modified file 'ubuntuone/syncdaemon/filesystem_manager.py'
--- ubuntuone/syncdaemon/filesystem_manager.py	2012-10-23 17:04:33 +0000
+++ ubuntuone/syncdaemon/filesystem_manager.py	2012-10-25 17:30:28 +0000
@@ -1371,7 +1371,6 @@
         def _get_matching():
             """Find the paths that match"""
             for p, m in self._idx_path.iteritems():
-                #basename = os.path.basename(p)
                 if pattern.match(p):
                     mdobj = self.fs[m]
                     if mdobj["server_hash"]: