Skip to content

testing: Fix ssh keys integration test #992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blackboxsw merged 4 commits into from
Aug 23, 2021
Merged

testing: Fix ssh keys integration test #992

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f8e08f
testing: Fix ssh keys integration test
TheRealFalcon Aug 23, 2021
de2430e
Update tests/integration_tests/modules/test_ssh_keysfile.py
TheRealFalcon Aug 23, 2021
274b01e
3rd times a charm?
TheRealFalcon Aug 23, 2021
f62dd5d
Merge branch 'main' into fix-ssh-test
TheRealFalcon Aug 23, 2021
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
8 changes: 7 additions & 1 deletion tests/integration_tests/modules/test_ssh_keysfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from io import StringIO
from paramiko.ssh_exception import SSHException

from tests.integration_tests.clouds import ImageSpecification
from tests.integration_tests.instances import IntegrationInstance
from tests.integration_tests.util import get_test_rsa_keypair

Expand Down Expand Up @@ -77,7 +78,12 @@ def common_verify(client, expected_keys):
# Ensure we haven't messed with any /home permissions
# See LP: #1940233
home_dir = '/home/{}'.format(user)
home_perms = '755'
# Home permissions aren't consistent between releases. On ubuntu
# this can change to 750 once focal is unsupported.
if ImageSpecification.from_os_image().release in ("bionic", "focal"):
home_perms = '755'
else:
home_perms = '750'
if user == 'root':
home_dir = '/root'
home_perms = '700'
Expand Down