Skip to content

Commit b3e783e

Browse files
committed
Revert "Add the SshAutoTransport transport plugin (aiidateam#6154)"
This reverts commit 71422eb.
1 parent b6d0fe5 commit b3e783e

File tree

5 files changed

+5
-80
lines changed

5 files changed

+5
-80
lines changed

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ requires-python = '>=3.9'
191191
'core.local' = 'aiida.transports.plugins.local:LocalTransport'
192192
'core.ssh' = 'aiida.transports.plugins.ssh:SshTransport'
193193
'core.ssh_async' = 'aiida.transports.plugins.ssh_async:AsyncSshTransport'
194-
'core.ssh_auto' = 'aiida.transports.plugins.ssh_auto:SshAutoTransport'
195194

196195
[project.entry-points.'aiida.workflows']
197196
'core.arithmetic.add_multiply' = 'aiida.workflows.arithmetic.add_multiply:add_multiply'

src/aiida/transports/plugins/ssh_auto.py

Lines changed: 0 additions & 61 deletions
This file was deleted.

tests/cmdline/commands/test_computer.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -977,13 +977,9 @@ def time_use_login_shell(authinfo, auth_params, use_login_shell, iterations) ->
977977
# comment on 'core.ssh_async':
978978
# It is important that 'ssh localhost' is functional in your test environment.
979979
# It should connect without asking for a password.
980-
# comment on 'core.ssh_auto':
981-
# It is important that no other options (except for `--safe-interval`) have to be specified for this transport type.
982-
@pytest.mark.parametrize(
983-
'transport_type, config', [('core.ssh_auto', []), ('core.ssh_async', ['--machine-or-host', 'localhost'])]
984-
)
980+
@pytest.mark.parametrize('transport_type, config', [('core.ssh_async', ['--machine-or-host', 'localhost'])])
985981
def test_computer_setup_with_various_transport(run_cli_command, aiida_computer, transport_type, config):
986-
"""Test setup of computer with ``core.ssh_auto`` and ``core.ssh_async`` entry points.
982+
"""Test setup of computer with ``core.ssh_async`` entry points.
987983
988984
pass any config option the setup needs in the parameter section``.
989985
"""

tests/engine/daemon/test_execmanager.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
from aiida.engine.daemon import execmanager
1919
from aiida.manage import get_manager
2020
from aiida.orm import CalcJobNode, FolderData, PortableCode, RemoteData, SinglefileData
21+
from aiida.plugins import entry_point
2122
from aiida.transports.plugins.local import LocalTransport
2223

2324

@@ -41,7 +42,7 @@ def file_hierarchy_simple():
4142
}
4243

4344

44-
@pytest.fixture(params=('core.local', 'core.ssh'))
45+
@pytest.fixture(params=entry_point.get_entry_point_names('aiida.transports'))
4546
def node_and_calc_info(aiida_localhost, aiida_computer_ssh, aiida_code_installed, request):
4647
"""Return a ``CalcJobNode`` and associated ``CalcInfo`` instance."""
4748

tests/transports/test_all_plugins.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,26 +59,16 @@ def tmp_path_local(tmp_path_factory):
5959
)
6060
def custom_transport(request, tmp_path_factory, monkeypatch) -> Transport:
6161
"""Fixture that parametrizes over all the registered implementations of the ``CommonRelaxWorkChain``."""
62-
plugin = TransportFactory(request.param)
63-
6462
if request.param == 'core.ssh':
6563
kwargs = {'machine': 'localhost', 'timeout': 30, 'load_system_host_keys': True, 'key_policy': 'AutoAddPolicy'}
66-
elif request.param == 'core.ssh_auto':
67-
kwargs = {'machine': 'localhost'}
68-
# The transport config is store in a independent temporary path per test to not mix up
69-
# with the files under operating.
70-
filepath_config = tmp_path_factory.mktemp('transport') / 'config'
71-
monkeypatch.setattr(plugin, 'FILEPATH_CONFIG', filepath_config)
72-
if not filepath_config.exists():
73-
filepath_config.write_text('Host localhost')
7464
elif request.param == 'core.ssh_async':
7565
kwargs = {
7666
'machine': 'localhost',
7767
}
7868
else:
7969
kwargs = {}
8070

81-
return plugin(**kwargs)
71+
return TransportFactory(request.param)(**kwargs)
8272

8373

8474
def test_is_open(custom_transport):

0 commit comments

Comments
 (0)