mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
ejabberd_user: bug fixes + tests (#7033)
* ejabberd_user: bug fixes + tests * fix changed property * add license to handler file * adjustments to test * add needs/target/setup_epel to aliases * further adjustments to integration tests * add target to integration tests * add some skips to test * skip centos as it has no ejabberd * skip fedora as it has no ejabberd * discard unused epel setup * add changelog frag * remove ejabberd before tests * fix typo
This commit is contained in:
parent
d08924d759
commit
c1f2f126cf
6 changed files with 137 additions and 2 deletions
2
changelogs/fragments/7033-ejabberd-user-bugs.yml
Normal file
2
changelogs/fragments/7033-ejabberd-user-bugs.yml
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
bugfixes:
|
||||||
|
- ejabberd_user - module was failing to detect whether user was already created and/or password was changed (https://github.com/ansible-collections/community.general/pull/7033).
|
|
@ -102,7 +102,7 @@ class EjabberdUser(object):
|
||||||
changed. It will return True if the user does not match the supplied
|
changed. It will return True if the user does not match the supplied
|
||||||
credentials and False if it does not
|
credentials and False if it does not
|
||||||
"""
|
"""
|
||||||
return self.run_command('check_password', [self.user, self.host, self.pwd])
|
return bool(self.run_command('check_password', [self.user, self.host, self.pwd])[0])
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def exists(self):
|
def exists(self):
|
||||||
|
@ -110,7 +110,7 @@ class EjabberdUser(object):
|
||||||
host specified. If the user exists True is returned, otherwise False
|
host specified. If the user exists True is returned, otherwise False
|
||||||
is returned
|
is returned
|
||||||
"""
|
"""
|
||||||
return self.run_command('check_account', [self.user, self.host])
|
return not bool(self.run_command('check_account', [self.user, self.host])[0])
|
||||||
|
|
||||||
def log(self, entry):
|
def log(self, entry):
|
||||||
""" This method will log information to the local syslog facility """
|
""" This method will log information to the local syslog facility """
|
||||||
|
|
11
tests/integration/targets/ejabberd_user/aliases
Normal file
11
tests/integration/targets/ejabberd_user/aliases
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
# Copyright (c) Ansible Project
|
||||||
|
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
azp/posix/3
|
||||||
|
skip/osx
|
||||||
|
skip/macos
|
||||||
|
skip/freebsd
|
||||||
|
skip/alpine
|
||||||
|
skip/rhel
|
||||||
|
destructive
|
|
@ -0,0 +1,9 @@
|
||||||
|
# Copyright (c) Ansible Project
|
||||||
|
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
---
|
||||||
|
- name: Remove ejabberd
|
||||||
|
ansible.builtin.package:
|
||||||
|
name: ejabberd
|
||||||
|
state: absent
|
7
tests/integration/targets/ejabberd_user/meta/main.yml
Normal file
7
tests/integration/targets/ejabberd_user/meta/main.yml
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
---
|
||||||
|
# Copyright (c) Ansible Project
|
||||||
|
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
dependencies:
|
||||||
|
- setup_pkg_mgr
|
106
tests/integration/targets/ejabberd_user/tasks/main.yml
Normal file
106
tests/integration/targets/ejabberd_user/tasks/main.yml
Normal file
|
@ -0,0 +1,106 @@
|
||||||
|
---
|
||||||
|
####################################################################
|
||||||
|
# WARNING: These are designed specifically for Ansible tests #
|
||||||
|
# and should not be used as examples of how to write Ansible roles #
|
||||||
|
####################################################################
|
||||||
|
|
||||||
|
# Copyright (c) Ansible Project
|
||||||
|
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
- name: Bail out if not supported
|
||||||
|
ansible.builtin.meta: end_play
|
||||||
|
when: ansible_distribution in ('Alpine', 'openSUSE Leap', 'CentOS', 'Fedora')
|
||||||
|
|
||||||
|
|
||||||
|
- name: Remove ejabberd
|
||||||
|
ansible.builtin.package:
|
||||||
|
name: ejabberd
|
||||||
|
state: absent
|
||||||
|
|
||||||
|
- name: Create user without ejabberdctl installed
|
||||||
|
community.general.ejabberd_user:
|
||||||
|
host: localhost
|
||||||
|
username: alice
|
||||||
|
password: pa$$w0rd
|
||||||
|
state: present
|
||||||
|
register: user_no_ejabberdctl
|
||||||
|
ignore_errors: true
|
||||||
|
|
||||||
|
- name: Install ejabberd
|
||||||
|
ansible.builtin.package:
|
||||||
|
name: ejabberd
|
||||||
|
state: present
|
||||||
|
notify: Remove ejabberd
|
||||||
|
|
||||||
|
- ansible.builtin.service:
|
||||||
|
name: ejabberd
|
||||||
|
state: started
|
||||||
|
|
||||||
|
- name: Create user alice (check)
|
||||||
|
community.general.ejabberd_user:
|
||||||
|
host: localhost
|
||||||
|
username: alice
|
||||||
|
password: pa$$w0rd
|
||||||
|
state: present
|
||||||
|
check_mode: true
|
||||||
|
register: user_alice_check
|
||||||
|
|
||||||
|
- name: Create user alice
|
||||||
|
community.general.ejabberd_user:
|
||||||
|
host: localhost
|
||||||
|
username: alice
|
||||||
|
password: pa$$w0rd
|
||||||
|
state: present
|
||||||
|
register: user_alice
|
||||||
|
|
||||||
|
- name: Create user alice (idempotency)
|
||||||
|
community.general.ejabberd_user:
|
||||||
|
host: localhost
|
||||||
|
username: alice
|
||||||
|
password: pa$$w0rd
|
||||||
|
state: present
|
||||||
|
register: user_alice_idempot
|
||||||
|
|
||||||
|
- name: Create user alice (change password)
|
||||||
|
community.general.ejabberd_user:
|
||||||
|
host: localhost
|
||||||
|
username: alice
|
||||||
|
password: different_pa$$w0rd
|
||||||
|
state: present
|
||||||
|
register: user_alice_chgpw
|
||||||
|
|
||||||
|
- name: Remove user alice (check)
|
||||||
|
community.general.ejabberd_user:
|
||||||
|
host: localhost
|
||||||
|
username: alice
|
||||||
|
state: absent
|
||||||
|
register: remove_alice_check
|
||||||
|
check_mode: true
|
||||||
|
|
||||||
|
- name: Remove user alice
|
||||||
|
community.general.ejabberd_user:
|
||||||
|
host: localhost
|
||||||
|
username: alice
|
||||||
|
state: absent
|
||||||
|
register: remove_alice
|
||||||
|
|
||||||
|
- name: Remove user alice (idempotency)
|
||||||
|
community.general.ejabberd_user:
|
||||||
|
host: localhost
|
||||||
|
username: alice
|
||||||
|
state: absent
|
||||||
|
register: remove_alice_idempot
|
||||||
|
|
||||||
|
- name: Assertions
|
||||||
|
ansible.builtin.assert:
|
||||||
|
that:
|
||||||
|
- user_no_ejabberdctl is failed
|
||||||
|
- "'Failed to find required executable' in user_no_ejabberdctl.msg"
|
||||||
|
- user_alice_check is changed
|
||||||
|
- user_alice is changed
|
||||||
|
- user_alice_idempot is not changed
|
||||||
|
- user_alice_chgpw is changed
|
||||||
|
- remove_alice_check is changed
|
||||||
|
- remove_alice is changed
|
||||||
|
- remove_alice_idempot is not changed
|
Loading…
Reference in a new issue