diff --git a/changelogs/fragments/T7238_logging_global.yml b/changelogs/fragments/T7238_logging_global.yml new file mode 100644 index 00000000..2be46968 --- /dev/null +++ b/changelogs/fragments/T7238_logging_global.yml @@ -0,0 +1,3 @@ +--- +trivial: + - vyos_logging_global - fix get_version in integration tests diff --git a/changelogs/fragments/test_module_patch.yml b/changelogs/fragments/test_module_patch.yml new file mode 100644 index 00000000..557a941a --- /dev/null +++ b/changelogs/fragments/test_module_patch.yml @@ -0,0 +1,3 @@ +--- +trivial: + - util.py - Add mock _ANSIBLE_PROFILE to reflect changes to Ansible libs diff --git a/tests/integration/targets/vyos_logging_global/tests/cli/_populate.yaml b/tests/integration/targets/vyos_logging_global/tests/cli/_populate.yaml index 89fb8e51..a17021b4 100644 --- a/tests/integration/targets/vyos_logging_global/tests/cli/_populate.yaml +++ b/tests/integration/targets/vyos_logging_global/tests/cli/_populate.yaml @@ -1,42 +1,43 @@ --- +- ansible.builtin.include_tasks: _get_version.yaml - ansible.builtin.include_tasks: _remove_config.yaml - name: POPULATE Apply the provided configuration register: result vyos.vyos.vyos_logging_global: config: console: facilities: - facility: all - facility: local7 severity: err - facility: news severity: debug files: - path: def archive: file_num: 2 facilities: - facility: local6 severity: emerg - facility: local7 severity: emerg hosts: "{{ populate_logging_global_hosts }}" users: - username: vyos facilities: - facility: local7 severity: debug - facility: local6 severity: alert - username: paul facilities: - facility: local7 severity: err global_params: facilities: - facility: cron severity: debug - facility: local7 severity: debug state: merged diff --git a/tests/unit/modules/utils.py b/tests/unit/modules/utils.py index 6489f13f..e2d17abd 100644 --- a/tests/unit/modules/utils.py +++ b/tests/unit/modules/utils.py @@ -1,55 +1,58 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type import json import unittest from unittest.mock import patch from ansible.module_utils import basic from ansible.module_utils._text import to_bytes def set_module_args(args): if "_ansible_remote_tmp" not in args: args["_ansible_remote_tmp"] = "/tmp" if "_ansible_keep_remote_files" not in args: args["_ansible_keep_remote_files"] = False args = json.dumps({"ANSIBLE_MODULE_ARGS": args}) basic._ANSIBLE_ARGS = to_bytes(args) + profile = "legacy" + basic._ANSIBLE_PROFILE = profile + class AnsibleExitJson(Exception): pass class AnsibleFailJson(Exception): pass def exit_json(*args, **kwargs): if "changed" not in kwargs: kwargs["changed"] = False raise AnsibleExitJson(kwargs) def fail_json(*args, **kwargs): kwargs["failed"] = True raise AnsibleFailJson(kwargs) class ModuleTestCase(unittest.TestCase): def setUp(self): self.mock_module = patch.multiple( basic.AnsibleModule, exit_json=exit_json, fail_json=fail_json, ) self.mock_module.start() self.mock_sleep = patch("time.sleep") self.mock_sleep.start() set_module_args({}) self.addCleanup(self.mock_module.stop) self.addCleanup(self.mock_sleep.stop)