Changeset 713

Timestamp:

2007-07-22 12:39:10 (1 year ago)

Author:

schwa

Message:

Added test code and applied a fix for a failing `makedirs` called from
a non-root directory. Issue and fix suggestion are by Julian (ticket
#22, http://ftputil.sschwarzer.net/trac/ticket/22 ).

Files:

• trunk/_test_real_ftp.py (modified) (2 diffs)
• trunk/ftputil.py (modified) (2 diffs)

trunk/_test_real_ftp.py

@@ -127 +127 @@
-    def test_makedirs_without_existing_dirs(self):
-        host = self.host
-dir1
+_dir1_
-        self.failIf('_dir1_' in host.listdir(host.curdir))
-        # vanilla case, all should go well
@@ -141 +141 @@
-        host.rmdir('_dir1_/dir2')
-        host.rmdir('_dir1_')
+
+    def test_makedirs_from_not_root_directory(self):
+        # this is a testcase for issue #22, see
+        #  http://ftputil.sschwarzer.net/trac/ticket/22
+        host = self.host
+        # no `_dir1_` and `_dir2_` yet
+        self.failIf('_dir1_' in host.listdir(host.curdir))
+        self.failIf('_dir2_' in host.listdir(host.curdir))
+        # part 1: try to make directories starting from `_dir1_`
+        # make and change to non-root directory
+        host.mkdir('_dir1_')
+        host.chdir('_dir1_')
+        host.makedirs('_dir2_/_dir3_')
+        # test for expected directory hierarchy
+        self.failUnless(host.path.isdir('/_dir1_'))
+        self.failUnless(host.path.isdir('/_dir1_/_dir2_'))
+        self.failUnless(host.path.isdir('/_dir1_/_dir2_/_dir3_'))
+        self.failIf(host.path.isdir('/_dir1_/_dir1_'))
+        # remove all but the directory were in
+        host.rmdir('/_dir1_/_dir2_/_dir3_')
+        host.rmdir('/_dir1_/_dir2_')
+        # part 2: try to make directories starting from root
+        host.makedirs('/_dir2_/_dir3_')
+        # test for expected directory hierarchy
+        self.failUnless(host.path.isdir('/_dir2_'))
+        self.failUnless(host.path.isdir('/_dir2_/_dir3_'))
+        self.failIf(host.path.isdir('/_dir1_/_dir2_'))
+        # clean up
+        host.rmdir('/_dir2_/_dir3_')
+        host.rmdir('/_dir2_')
+        host.chdir(host.pardir)
+        host.rmdir('/_dir1_')
-
-    def test_makedirs_of_existing_directory(self):

trunk/ftputil.py

@@ -413 +413 @@
-        """
-        Copy a file from source to target. Which of both is a local
-
+s
-        """
-        source_mode, target_mode = self.__get_modes(mode)
@@ -609 +609 @@
-        #  the "lowermost" directory
-        for index in range(1, len(directories)):
-
+
+
-            try:
-                self.mkdir(next_directory)