Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/changelog-fragments/782.contrib.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
The SSHD start probe client command is now shielded from external
environmnent and will no longer attempt using an SSH agent on the
machine where the tests are involved, nor will it use alternative
authentication methods -- by :user:`webknjaz`.
14 changes: 10 additions & 4 deletions tests/_service_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,17 @@ def wait_for_svc_ready_state(
"""
cmd = [
'/usr/bin/ssh',
f'-l{getpass.getuser()!s}',
f'-i{clientkey_path!s}',
f'-p{port!s}',
'-oUserKnownHostsFile=/dev/null',
'-F/dev/null', # or -Fnone
'-oConnectTimeout=1',
'-oIdentitiesOnly=yes',
'-oIdentityAgent=/dev/null',
f'-oIdentityFile={clientkey_path!s}',
'-oPasswordAuthentication=no',
f'-oPort={port!s}',
'-oPreferredAuthentications=publickey',
'-oStrictHostKeyChecking=no',
f'-oUser={getpass.getuser()!s}',
'-oUserKnownHostsFile=/dev/null',
host,
'--',
'exit 0',
Expand Down
Loading