Merge lp:~mwhudson/launchpad/dont-oops-sftp-unlink-directory-bug-372506 into lp:launchpad

[Michael Hudson-Doyle]

Catch the error raised by transports when you try to delete() a directory to avoid logging an entirely spurious oops.

[Michael Hudson-Doyle (mwhudson)]

Hi,

This fixes a simple oops bug: delete('path/to/directory') on a bzr Transport raises an exception we didn't know how to translate, leading to an oops being logged.

Cheers,
mwh

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'lib/lp/codehosting/sftp.py'
--- lib/lp/codehosting/sftp.py	2009-06-25 04:06:00 +0000
+++ lib/lp/codehosting/sftp.py	2009-10-29 01:05:25 +0000
@@ -429,6 +429,7 @@
             bzr_errors.NoSuchFile: filetransfer.FX_NO_SUCH_FILE,
             bzr_errors.FileExists: filetransfer.FX_FILE_ALREADY_EXISTS,
             bzr_errors.DirectoryNotEmpty: filetransfer.FX_FAILURE,
+            bzr_errors.TransportError: filetransfer.FX_FAILURE,
             FileIsADirectory: filetransfer.FX_FILE_IS_A_DIRECTORY,
             }
         # Bazaar expects makeDirectory to fail with exactly the string "mkdir

=== modified file 'lib/lp/codehosting/tests/test_sftp.py'
--- lib/lp/codehosting/tests/test_sftp.py	2009-06-25 04:06:00 +0000
+++ lib/lp/codehosting/tests/test_sftp.py	2009-10-29 01:05:25 +0000
@@ -455,6 +455,13 @@
         deferred = self.sftp_server.removeFile(filename)
         return self.assertFailure(deferred, filetransfer.SFTPError)
 
+    def test_removeFile_directory(self):
+        # Errors in removeFile are translated into SFTPErrors.
+        filename = self.getPathSegment()
+        self.build_tree_contents([(filename+'/',)])
+        deferred = self.sftp_server.removeFile(filename)
+        return self.assertFailure(deferred, filetransfer.SFTPError)
+
     def test_renameFile(self):
         # renameFile renames the file.
         orig_filename = self.getPathSegment()