From 59598906fa07fb7bb3d4fadc9ccb122d4f72143d Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 22 Feb 2024 00:56:58 +0200 Subject: [PATCH] some fixes --- plugins/module_utils/user.py | 9 ++++----- .../test_mysql_user/tasks/test_password_expire.yml | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/plugins/module_utils/user.py b/plugins/module_utils/user.py index 4362910..3b1b2b0 100644 --- a/plugins/module_utils/user.py +++ b/plugins/module_utils/user.py @@ -337,11 +337,10 @@ def user_mod(cursor, user, host, host_all, password, encrypted, update = True - if module.check_mode: - return {'changed': True, 'msg': msg, 'password_changed': password_changed} - set_password_expire(cursor, user, host, password_expire, password_expire_interval) - password_changed = True - changed = True + if not module.check_mode: + set_password_expire(cursor, user, host, password_expire, password_expire_interval) + password_changed = True + changed = True # Handle plugin authentication if plugin and not role: diff --git a/tests/integration/targets/test_mysql_user/tasks/test_password_expire.yml b/tests/integration/targets/test_mysql_user/tasks/test_password_expire.yml index c858c48..7e70ece 100644 --- a/tests/integration/targets/test_mysql_user/tasks/test_password_expire.yml +++ b/tests/integration/targets/test_mysql_user/tasks/test_password_expire.yml @@ -113,7 +113,7 @@ password_expire: interval password_expire_interval: 10 check_mode: true - expect_change: true + expect_change: false expected_password_lifetime: "0" expected_password_expired: "N" @@ -162,7 +162,7 @@ state: present register: result check_mode: True - failed_when: result is not changed + failed_when: result is changed - include_tasks: utils/remove_user.yml vars: