|
33 | 33 | ]
|
34 | 34 | )
|
35 | 35 |
|
| 36 | +# content: ssh version, release shortcut, |
| 37 | +ssh_pkg_info = { |
| 38 | + "rockylinux9": ("8.", ".el9"), |
| 39 | + "debian_bookworm": ("1:9.2", None), |
| 40 | +} |
| 41 | + |
| 42 | +# content: distribution, codename, architecture, release_regex |
| 43 | +docker_image_info = { |
| 44 | + "rockylinux9": ("rocky", None, "x86_64", r"^9.\d+$"), |
| 45 | + "debian_bookworm": ("debian", "bookworm", "amd64", r"^12"), |
| 46 | +} |
| 47 | + |
36 | 48 |
|
37 | 49 | @all_images
|
38 | 50 | def test_package(host, docker_image):
|
39 | 51 | assert not host.package("zsh").is_installed
|
40 | 52 | ssh = host.package("openssh-server")
|
41 |
| - version = { |
42 |
| - "rockylinux9": "8.", |
43 |
| - "debian_bookworm": "1:9.2", |
44 |
| - }[docker_image] |
| 53 | + ssh_version, sshd_release = ssh_pkg_info[docker_image] |
45 | 54 | assert ssh.is_installed
|
46 |
| - assert ssh.version.startswith(version) |
47 |
| - release = { |
48 |
| - "rockylinux9": ".el9", |
49 |
| - "debian_bookworm": None, |
50 |
| - }[docker_image] |
51 |
| - if release is None: |
| 55 | + assert ssh.version.startswith(ssh_version) |
| 56 | + if sshd_release is None: |
52 | 57 | with pytest.raises(NotImplementedError):
|
53 | 58 | ssh.release # noqa: B018
|
54 | 59 | else:
|
55 |
| - assert release in ssh.release |
| 60 | + assert sshd_release in ssh.release |
56 | 61 |
|
57 | 62 |
|
58 | 63 | def test_held_package(host):
|
@@ -102,14 +107,10 @@ def test_uninstalled_package_version(host):
|
102 | 107 | def test_systeminfo(host, docker_image):
|
103 | 108 | assert host.system_info.type == "linux"
|
104 | 109 |
|
105 |
| - release, distribution, codename, arch = { |
106 |
| - "rockylinux9": (r"^9.\d+$", "rocky", None, "x86_64"), |
107 |
| - "debian_bookworm": (r"^12", "debian", "bookworm", "x86_64"), |
108 |
| - }[docker_image] |
109 |
| - |
| 110 | + distribution, codename, unused_arch, release_regex = docker_image_info[docker_image] |
110 | 111 | assert host.system_info.distribution == distribution
|
111 | 112 | assert host.system_info.codename == codename
|
112 |
| - assert re.match(release, host.system_info.release) |
| 113 | + assert re.match(release_regex, host.system_info.release) |
113 | 114 |
|
114 | 115 |
|
115 | 116 | @all_images
|
|
0 commit comments