Changeset 1677:b4c9b089b6b8

Timestamp:

Oct 28, 2017, 7:17:42 PM (19 months ago)

Author:

Stefan Schwarzer <sschwarzer@…>

Branch:

default

Message:

Apply `normpath` when getting the working directory

When getting the current working directory of the FTP session, apply
`normpath`. This makes sure that an initial `FTPHost.getcwd` call
returns the current working without a trailing slash (with the
exception of the current directory being `/`).

ticket: 113

Files:

• ftputil/host.py (modified) (1 diff)
• test/test_host.py (modified) (3 diffs)

ftputil/host.py

@@ -78 +78 @@
         with ftputil.error.ftplib_error_to_ftp_os_error:
             self._cached_current_dir = \
-              ftputil.tool.as_unicode(self._session.pwd())
+              self.path.normpath(ftputil.tool.as_unicode(self._session.pwd()))
         # Associated `FTPHost` objects for data transfer.
         self._children = []

test/test_host.py

@@ -71 +71 @@
         if not hasattr(self, "pwd_called"):
             self.pwd_called = True
+            return "/home"
         else:
             raise ftplib.error_temp
+
+
+class UnnormalizedCurrentWorkingDirectory(mock_ftplib.MockSession):
+
+    def pwd(self):
+        # Deliberately return the current working directory with a
+        # trailing slash to test if it's removed when stored in the
+        # `FTPHost` instance.
+        return "/home/"
 
 
@@ -159 +169 @@
 # Test cases
 #
-class TestInitAndClose(object):
-    """Test initialization and closure of `FTPHost` objects."""
+class TestConstructor(object):
+    """
+    Test initialization of `FTPHost` objects.
+    """
 
     def test_open_and_close(self):
+        """
+        Test if opening and closing an `FTPHost` object works as
+        expected.
+        """
         host = test_base.ftp_host_factory()
         host.close()
@@ -168 +184 @@
         assert host._children == []
 
-
-class TestLogin(object):
-
     def test_invalid_login(self):
         """Login to invalid host must fail."""
         with pytest.raises(ftputil.error.FTPOSError):
             test_base.ftp_host_factory(FailOnLoginSession)
+
+    def test_pwd_normalization(self):
+        """
+        Test if the stored current directory is normalized.
+        """
+        host = test_base.ftp_host_factory(UnnormalizedCurrentWorkingDirectory)
+        assert host.getcwd() == "/home"