Merge lp:~adiroiban/twisted/twisted-5259 into lp:twisted

[Adi Roiban]

I have implemented removeDirectory, in the same way removeFile was already implemented.

RFC 595 specifies that RMD should have the same behavior as DELE.

=== modified file 'twisted/protocols/ftp.py'
--- twisted/protocols/ftp.py	2011-04-10 14:17:53 +0000
+++ twisted/protocols/ftp.py	2011-09-09 16:40:19 +0000
@@ -2759,6 +2759,23 @@
         """
         return self.queueStringCommand('DELE ' + self.escapePath(path))
 
+    def removeDirectory(self, path):
+        """
+        Delete a directory on the server.
+
+        L{removeDirectory} issues a I{RMD} command to the server to remove the
+        indicated file. Described in RFC959.
+
+        @param path: The path to the directory to delete. May be relative to
+            the current dir.
+        @type path: C{str}
+
+        @return: A L{Deferred} which fires when the server responds. On error,
+            it is errbacked with either L{CommandFailed} or L{BadResponse}. On
+            success, it is called back with a list of response lines.
+        @rtype: L{Deferred}
+        """
+        return self.queueStringCommand('RMD ' + self.escapePath(path))
 
     def cdup(self):
         """

=== modified file 'twisted/test/test_ftp.py'
--- twisted/test/test_ftp.py	2011-07-14 18:05:14 +0000
+++ twisted/test/test_ftp.py	2011-09-09 16:40:19 +0000
@@ -1888,6 +1888,65 @@
         map(self.client.lineReceived, response)
         return d.addCallback(self.assertTrue)
 
+    def test_removeDirectory(self):
+        """
+        L{ftp.FTPClient.removeDirectory} sends a I{RMD} command to the server
+        for the indicated file and returns a Deferred which fires after the
+        server sends a 250 response code.
+        """
+        self._testLogin()
+        d = self.client.removeDirectory('/tmp/test')
+        self.assertEqual(self.transport.value(), 'RMD /tmp/test\r\n')
+        response = '250 Requested file action okay, completed.'
+        self.client.lineReceived(response)
+        return d.addCallback(self.assertEqual, [response])
+
+
+    def test_failedRemoveDirectory(self):
+        """
+        If the server returns a response code other than 250 in response to a
+        I{RMD} sent by L{ftp.FTPClient.removeDirectory}, the L{Deferred}
+        returned by C{removeDirectory} is errbacked with a L{Failure} wrapping
+        a L{CommandFailed}.
+        """
+        self._testLogin()
+        d = self.client.removeDirectory("/tmp/test")
+        self.assertEqual(self.transport.value(), 'RMD /tmp/test\r\n')
+        response = '501 Syntax error in parameters or arguments.'
+        self.client.lineReceived(response)
+        d = self.assertFailure(d, ftp.CommandFailed)
+        d.addCallback(lambda exc: self.assertEqual(exc.args, ([response],)))
+        return d
+
+
+    def test_unparsableRemoveDirectoryResponse(self):
+        """
+        If the server returns a response line which cannot be parsed, the
+        L{Deferred} returned by L{ftp.FTPClient.removeDirectory} is errbacked
+        with a L{BadResponse} containing the response.
+        """
+        self._testLogin()
+        d = self.client.removeDirectory("/tmp/test")
+        response = '765 blah blah blah'
+        self.client.lineReceived(response)
+        d = self.assertFailure(d, ftp.BadResponse)
+        d.addCallback(lambda exc: self.assertEqual(exc.args, ([response],)))
+        return d
+
+
+    def test_multilineRemoveDirectoryResponse(self):
+        """
+        If the server returns multiple response lines, the L{Deferred} returned
+        by L{ftp.FTPClient.removeDirectory} is still fired with a true value
+         if the ultimate response code is 250.
+        """
+        self._testLogin()
+        d = self.client.removeDirectory("/tmp/test")
+        response = ['250-perhaps a progress report',
+                    '250 okay']
+        map(self.client.lineReceived, response)
+        return d.addCallback(self.assertTrue)
+
 
 
 class FTPClientBasicTests(unittest.TestCase):