Windows support: path

Author: penguinolog

exec_helpers/ssh_client.py

@@ -87,7 +87,7 @@ def upload(self, source, target):
             self.mkdir(targetdir)
 
             for entry in files:
-                local_path = os.path.join(rootdir, entry)
+                local_path = os.path.normpath(os.path.join(rootdir, entry))
                 remote_path = posixpath.join(targetdir, entry)
                 if self.exists(remote_path):
                     self._sftp.unlink(remote_path)

test/test_ssh_client.py

@@ -24,7 +24,7 @@
 import base64
 import contextlib
 import logging
-from os import path
+import os
 import posixpath
 import stat
 import unittest
@@ -1843,11 +1843,11 @@ def test_download(
         self.assertTrue(result)
         isdir.assert_called_once_with(target)
         exists.assert_called_once_with(posixpath.join(
-            target, path.basename(dst)))
+            target, os.path.basename(dst)))
         remote_isdir.assert_called_once_with(dst)
         remote_exists.assert_called_once_with(dst)
         _sftp.assert_has_calls((
-            mock.call.get(dst, posixpath.join(target, path.basename(dst))),
+            mock.call.get(dst, posixpath.join(target, os.path.basename(dst))),
         ))
 
         # Negative scenarios
@@ -1917,7 +1917,7 @@ def test_upload_dir(
         source = '/tmp/bash'
         filename = 'bashrc'
         walk.return_value = (source, '', [filename]),
-        expected_path = posixpath.join(target, path.basename(source))
+        expected_path = posixpath.join(target, os.path.basename(source))
         expected_file = posixpath.join(expected_path, filename)
 
         # noinspection PyTypeChecker
@@ -1928,5 +1928,8 @@ def test_upload_dir(
         exists.assert_called_once_with(expected_file)
         _sftp.assert_has_calls((
             mock.call.unlink(expected_file),
-            mock.call.put(posixpath.join(source, filename), expected_file),
+            mock.call.put(
+                os.path.normpath(os.path.join(source, filename)),
+                expected_file
+            ),
         ))