ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fixes unit tests for bigip_device_auth that were broken in 2.8 (#48459)

Browse source
This commit is contained in:
Tim Rupp 2018-11-09 21:56:26 -08:00 committed by GitHub
parent 68084d989c
commit c161ffef81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/modules/network/f5/bigip_device_auth.py
View file

@ -790,8 +790,9 @@ def main():
supports_check_mode=spec.supports_check_mode, supports_check_mode=spec.supports_check_mode,
) )
client = F5RestClient(**module.params)
try: try:
client = F5RestClient(**module.params)
mm = ModuleManager(module=module, client=client) mm = ModuleManager(module=module, client=client)
results = mm.exec_module() results = mm.exec_module()
cleanup_tokens(client) cleanup_tokens(client)

20
test/units/modules/network/f5/test_bigip_device_auth.py
View file

@ -8,16 +8,12 @@ __metaclass__ = type
import os import os
import json import json
import pytest
import sys import sys
from nose.plugins.skip import SkipTest from nose.plugins.skip import SkipTest
if sys.version_info < (2, 7): if sys.version_info < (2, 7):
raise SkipTest("F5 Ansible modules require Python >= 2.7") raise SkipTest("F5 Ansible modules require Python >= 2.7")
from units.compat import unittest
from units.compat.mock import Mock
from units.compat.mock import patch
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
try: try:
@ -26,8 +22,13 @@ try:
from library.modules.bigip_device_auth import TacacsManager from library.modules.bigip_device_auth import TacacsManager
from library.modules.bigip_device_auth import ModuleManager from library.modules.bigip_device_auth import ModuleManager
from library.modules.bigip_device_auth import ArgumentSpec from library.modules.bigip_device_auth import ArgumentSpec
from library.module_utils.network.f5.common import F5ModuleError
from test.unit.modules.utils import set_module_args # In Ansible 2.8, Ansible changed import paths.
from test.units.compat import unittest
from test.units.compat.mock import Mock
from test.units.compat.mock import patch
from test.units.modules.utils import set_module_args
except ImportError: except ImportError:
try: try:
from ansible.modules.network.f5.bigip_sys_auth import TacacsApiParameters from ansible.modules.network.f5.bigip_sys_auth import TacacsApiParameters
@ -35,7 +36,12 @@ except ImportError:
from ansible.modules.network.f5.bigip_sys_auth import TacacsManager from ansible.modules.network.f5.bigip_sys_auth import TacacsManager
from ansible.modules.network.f5.bigip_sys_auth import ModuleManager from ansible.modules.network.f5.bigip_sys_auth import ModuleManager
from ansible.modules.network.f5.bigip_sys_auth import ArgumentSpec from ansible.modules.network.f5.bigip_sys_auth import ArgumentSpec
from ansible.module_utils.network.f5.common import F5ModuleError
# Ansible 2.8 imports
from units.compat import unittest
from units.compat.mock import Mock
from units.compat.mock import patch
from units.modules.utils import set_module_args from units.modules.utils import set_module_args
except ImportError: except ImportError:
raise SkipTest("F5 Ansible modules require the f5-sdk Python library") raise SkipTest("F5 Ansible modules require the f5-sdk Python library")