From 364e491b7e65c0ecfaf769078e12b283dc69b8bc Mon Sep 17 00:00:00 2001 From: Alexei Znamensky <103110+russoz@users.noreply.github.com> Date: Wed, 3 Dec 2025 19:19:55 +1300 Subject: [PATCH] [stable-11] monit: fix check for pending (#11253) * monit: fix check for pending * add changelog frag * adjust testcases --- changelogs/fragments/11245-monit-enum.yml | 2 ++ plugins/modules/monit.py | 2 +- tests/unit/plugins/modules/test_monit.py | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 changelogs/fragments/11245-monit-enum.yml diff --git a/changelogs/fragments/11245-monit-enum.yml b/changelogs/fragments/11245-monit-enum.yml new file mode 100644 index 0000000000..e20b49aacc --- /dev/null +++ b/changelogs/fragments/11245-monit-enum.yml @@ -0,0 +1,2 @@ +bugfixes: + - monit - internal state was not reflecting when operation is "pending" in ``monit`` (https://github.com/ansible-collections/community.general/pull/11245). diff --git a/plugins/modules/monit.py b/plugins/modules/monit.py index a6df722dd8..d94556fd95 100644 --- a/plugins/modules/monit.py +++ b/plugins/modules/monit.py @@ -187,7 +187,7 @@ class Monit(object): else: status = Status.NOT_MONITORED - if state == 'pending': + if state == 'PENDING': status = status.pending() return status diff --git a/tests/unit/plugins/modules/test_monit.py b/tests/unit/plugins/modules/test_monit.py index 0c854d913d..197566af51 100644 --- a/tests/unit/plugins/modules/test_monit.py +++ b/tests/unit/plugins/modules/test_monit.py @@ -116,10 +116,10 @@ BASIC_OUTPUT_CASES = [ @pytest.mark.parametrize('output, expected', BASIC_OUTPUT_CASES + [ ('', monit.Status.MISSING), (TEST_OUTPUT % ('Process', 'processY', 'OK'), monit.Status.MISSING), - (TEST_OUTPUT % ('Process', 'processX', 'Not Monitored - start pending'), monit.Status.OK), - (TEST_OUTPUT % ('Process', 'processX', 'Monitored - stop pending'), monit.Status.NOT_MONITORED), - (TEST_OUTPUT % ('Process', 'processX', 'Monitored - restart pending'), monit.Status.OK), - (TEST_OUTPUT % ('Process', 'processX', 'Not Monitored - monitor pending'), monit.Status.OK), + (TEST_OUTPUT % ('Process', 'processX', 'Not Monitored - start pending'), monit.Status.OK.pending()), + (TEST_OUTPUT % ('Process', 'processX', 'Monitored - stop pending'), monit.Status.NOT_MONITORED.pending()), + (TEST_OUTPUT % ('Process', 'processX', 'Monitored - restart pending'), monit.Status.OK.pending()), + (TEST_OUTPUT % ('Process', 'processX', 'Not Monitored - monitor pending'), monit.Status.OK.pending()), (TEST_OUTPUT % ('Process', 'processX', 'Does not exist'), monit.Status.DOES_NOT_EXIST), (TEST_OUTPUT % ('Process', 'processX', 'Not monitored'), monit.Status.NOT_MONITORED), (TEST_OUTPUT % ('Process', 'processX', 'Running'), monit.Status.OK),