|
33 | 33 | ]
|
34 | 34 | )
|
35 | 35 |
|
36 |
| -# content: ssh version, release shortcut, |
| 36 | +# content: ssh version, release shortcut, service name |
37 | 37 | ssh_pkg_info = {
|
38 |
| - "rockylinux9": ("8.", ".el9"), |
39 |
| - "debian_bookworm": ("1:9.2", None), |
| 38 | + "rockylinux9": ("8.", ".el9", "sshd"), |
| 39 | + "debian_bookworm": ("1:9.2", None, "ssh"), |
40 | 40 | }
|
41 | 41 |
|
42 | 42 | # content: distribution, codename, architecture, release_regex
|
|
50 | 50 | def test_package(host, docker_image):
|
51 | 51 | assert not host.package("zsh").is_installed
|
52 | 52 | ssh = host.package("openssh-server")
|
53 |
| - ssh_version, sshd_release = ssh_pkg_info[docker_image] |
| 53 | + ssh_version, sshd_release = ssh_pkg_info[docker_image][:2] |
54 | 54 | assert ssh.is_installed
|
55 | 55 | assert ssh.version.startswith(ssh_version)
|
56 | 56 | if sshd_release is None:
|
@@ -115,8 +115,8 @@ def test_systeminfo(host, docker_image):
|
115 | 115 |
|
116 | 116 | @all_images
|
117 | 117 | def test_ssh_service(host, docker_image):
|
118 |
| - name = "sshd" if docker_image == "rockylinux9" else "ssh" |
119 |
| - ssh = host.service(name) |
| 118 | + service_name = ssh_pkg_info[docker_image][2] |
| 119 | + ssh = host.service(service_name) |
120 | 120 | # wait at max 10 seconds for ssh is running
|
121 | 121 | for _ in range(10):
|
122 | 122 | if ssh.is_running:
|
|
0 commit comments