bug fix

Author: khsrali

src/aiida/transports/plugins/ssh_async.py

@@ -618,6 +618,8 @@ async def copy_async(
         :type preserve: bool
 
         :raises: OSError, src does not exist or if the copy execution failed.
+        :raises: FileNotFoundError, if either remotesource does not exists
+            or remotedestination's parent path does not exists
         """
 
         remotesource = str(remotesource)
@@ -648,7 +650,8 @@ async def copy_async(
                     )
                 else:
                     if not await self.path_exists_async(remotesource):
-                        raise OSError(f'The remote path {remotesource} does not exist')
+                        raise FileNotFoundError(f'The remote path {remotesource} does not exist')
+
                     await self._sftp.copy(
                         remotesource,
                         remotedestination,
@@ -657,6 +660,13 @@ async def copy_async(
                         follow_symlinks=dereference,
                         remote_only=True,
                     )
+            except asyncssh.sftp.SFTPNoSuchFile as exc:
+                # note: one could just create directories, but aiida engine expects this behavior
+                # see `execmanager.py`::_copy_remote_files for more details
+                raise FileNotFoundError(
+                    f'The remote path {remotedestination} is not reachable,'
+                    f'perhaps the parent folder does not exists: {exc}'
+                )
             except asyncssh.sftp.SFTPFailure as exc:
                 raise OSError(f'Error while copying {remotesource} to {remotedestination}: {exc}')
         else:

tests/engine/daemon/test_execmanager.py

@@ -42,14 +42,19 @@ def file_hierarchy_simple():
     }
 
 
-@pytest.fixture(params=entry_point.get_entry_point_names('aiida.transports'))
-def node_and_calc_info(aiida_localhost, aiida_computer_ssh, aiida_code_installed, request):
+@pytest.fixture(
+    scope='function',
+    params=[name for name in entry_point.get_entry_point_names('aiida.transports') if name.startswith('core.')],
+)
+def node_and_calc_info(aiida_localhost, aiida_computer_ssh, aiida_computer_ssh_async, aiida_code_installed, request):
     """Return a ``CalcJobNode`` and associated ``CalcInfo`` instance."""
 
     if request.param == 'core.local':
         node = CalcJobNode(computer=aiida_localhost)
     elif request.param == 'core.ssh':
         node = CalcJobNode(computer=aiida_computer_ssh())
+    elif request.param == 'core.ssh_async':
+        node = CalcJobNode(computer=aiida_computer_ssh_async())
     else:
         raise ValueError(f'unsupported transport: {request.param}')
 
@@ -378,6 +383,7 @@ def test_upload_file_copy_operation_order(node_and_calc_info, tmp_path, order, e
         ),
         # Only remote copy of a single file to the "pseudo" directory
         # -> Copy fails silently since target directory does not exist: final directory structure is empty
+        # COUNTER-INTUITIVE: the silent behavior is expected. See `execmanager.py`::_copy_remote_files for more details
         (
             {},
             (),
@@ -386,6 +392,7 @@ def test_upload_file_copy_operation_order(node_and_calc_info, tmp_path, order, e
             None,
         ),
         # -> Copy fails silently since target directory does not exist: final directory structure is empty
+        # COUNTER-INTUITIVE: the silent behavior is expected. See `execmanager.py`::_copy_remote_files for more details
         (
             {},
             (),

tests/transports/test_all_plugins.py

@@ -59,6 +59,8 @@ def tmp_path_local(tmp_path_factory):
 )
 def custom_transport(request, tmp_path_factory, monkeypatch) -> Transport:
     """Fixture that parametrizes over all the registered implementations of the ``CommonRelaxWorkChain``."""
+    plugin = TransportFactory(request.param)
+
     if request.param == 'core.ssh':
         kwargs = {'machine': 'localhost', 'timeout': 30, 'load_system_host_keys': True, 'key_policy': 'AutoAddPolicy'}
     elif request.param == 'core.ssh_async':
@@ -68,7 +70,7 @@ def custom_transport(request, tmp_path_factory, monkeypatch) -> Transport:
     else:
         kwargs = {}
 
-    return TransportFactory(request.param)(**kwargs)
+    return plugin(**kwargs)
 
 
 def test_is_open(custom_transport):