Ticket #6284: 6284-2.diff

twisted/protocols/ftp.py

@@ -1220 +1220 @@
             Called from data transport when there are errors during the
             transfer.
             """
-            if err.check(FTPCmdError):
-                return (err.value.errorCode, '/'.join(newsegs))
-
             log.msg("Unexpected error received during transfer:")
             log.err(err)
+            if err.check(FTPCmdError):
+                return err
             return (CNX_CLOSED_TXFR_ABORTED,)
 
         d = self.shell.openForWriting(newsegs)

twisted/test/test_ftp.py

@@ -625 +625 @@
         # Make a failing file writer.
         class FailingFileWriter(ftp._FileWriter):
             def receive(self):
-                return defer.fail(ftp.IsADirectoryError("blah"))
+                return defer.fail(ftp.IsADirectoryError("failing_file"))
 
         def failingSTOR(a, b):
             return defer.succeed(FailingFileWriter(None))
@@ -636 +636 @@
 
         def eb(res):
             res.trap(ftp.CommandFailed)
+            logs = self.flushLoggedErrors()
+            self.assertEqual(1, len(logs))
+            self.assertIsInstance(logs[0].value, ftp.IsADirectoryError)
             self.assertEqual(
                 res.value.args[0][0],
                 "550 failing_file: is a directory")