Ticket #4909: diff.patch

twisted/test/test_ftp.py

@@ -422 +422 @@
         d2.addErrback(eb)
         return defer.gatherResults([d1, d2])
 
+    def test_STORwriteError(self):
+        """
+        Any errors during writing a file inside a STOR should be returned to
+        the client.
+        """
+        # Make a failing file writer.
+        class FailingFileWriter(ftp._FileWriter):
+            def receive(self):
+                return defer.fail(ftp.IsNotADirectoryError("blah"))
 
+        def failing_stor(a, b):
+            return defer.succeed(FailingFileWriter(None))
+
+        # Monkey patch the shell so it returns a file writer that will
+        # fail.
+        self.patch(ftp.FTPAnonymousShell, 'openForWriting', failing_stor)
+
+        def eb(res):
+            self.flushLoggedErrors()
+            res.trap(ftp.CommandFailed)
+            self.assertEquals(
+                res.value.args[0][0],
+                "550 Cannot rmd, ('blah',) is not a directory")
+        d1, d2 = self.client.storeFile('failing_file')
+        d2.addErrback(eb)
+        return defer.gatherResults([d1, d2])
+
+
 class FTPServerPasvDataConnectionTestCase(FTPServerTestCase):
     def _makeDataConnection(self, ignored=None):
         # Establish a passive data connection (i.e. client connecting to

twisted/protocols/ftp.py

@@ -1112 +1112 @@
         def ebSent(err):
             log.msg("Unexpected error receiving file from client:")
             log.err(err)
+            if err.check(FTPCmdError):
+                return (err.value.errorCode, err.value.errorMessage)
             return (CNX_CLOSED_TXFR_ABORTED,)
 
         def cbConsumer(cons):

twisted/topfiles/4909.feature

@@ +1 @@
+twisted.protocols.ftp.FTP.ftp_STOR now catches `FTPCmdError`s raised by
+the file writer, and returns the error back to the client.