fix apache unit tests (#9490)

Fixes https://github.com/certbot/certbot/issues/9481.

I poked around our other uses of this function and they seem OK to me for now, however, I opened https://github.com/certbot/certbot/issues/9489 to track the bigger refactor I think we should do here.
This commit is contained in:
Brad Warren 2022-12-01 12:27:24 -08:00 committed by GitHub
parent 8390c65a95
commit f0251a7959
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions

View file

@ -58,8 +58,13 @@ class CentOSConfigurator(configurator.ApacheConfigurator):
"rhel", "redhatenterpriseserver", "red hat enterprise linux server",
"scientific", "scientific linux",
]
# It is important that the loose version comparison below is not made
# if the OS is not RHEL derived. See
# https://github.com/certbot/certbot/issues/9481.
if not rhel_derived:
return False
at_least_v9 = util.parse_loose_version(os_version) >= util.parse_loose_version('9')
return rhel_derived and at_least_v9
return at_least_v9
def _override_cmds(self) -> None:
super()._override_cmds()

View file

@ -21,6 +21,7 @@ Certbot adheres to [Semantic Versioning](https://semver.org/).
have started erroring with `AttributeError` in Certbot v2.0.0.
- Plugin authors can find more information about Certbot 2.x compatibility
[here](https://github.com/certbot/certbot/wiki/Certbot-v2.x-Plugin-Compatibility).
* A bug causing our certbot-apache tests to crash on some systems has been resolved.
More details about these changes can be found on our GitHub repo.