Skip to content

Commit 52ad060

Browse files
Extract constants from functions to file level
1 parent dca7b05 commit 52ad060

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

test/test_modules.py

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,31 @@
3333
]
3434
)
3535

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+
3648

3749
@all_images
3850
def test_package(host, docker_image):
3951
assert not host.package("zsh").is_installed
4052
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]
4554
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:
5257
with pytest.raises(NotImplementedError):
5358
ssh.release # noqa: B018
5459
else:
55-
assert release in ssh.release
60+
assert sshd_release in ssh.release
5661

5762

5863
def test_held_package(host):
@@ -102,14 +107,10 @@ def test_uninstalled_package_version(host):
102107
def test_systeminfo(host, docker_image):
103108
assert host.system_info.type == "linux"
104109

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]
110111
assert host.system_info.distribution == distribution
111112
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)
113114

114115

115116
@all_images

0 commit comments

Comments
 (0)