ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-27 12:51:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fixes unit tests that were broken in ansible 2.8 (#48454)

Browse source
This commit is contained in:
Tim Rupp 2018-11-09 21:00:03 -08:00 • committed by GitHub
parent 5196188b97
commit d97abff0ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -448,8 +448,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)

22
test/units/modules/network/f5/test_bigip_cli_script.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:
@ -25,17 +21,25 @@ try:
from library.modules.bigip_cli_script import ModuleParameters from library.modules.bigip_cli_script import ModuleParameters
from library.modules.bigip_cli_script import ModuleManager from library.modules.bigip_cli_script import ModuleManager
from library.modules.bigip_cli_script import ArgumentSpec from library.modules.bigip_cli_script import ArgumentSpec
from library.module_utils.network.f5.common import F5ModuleError
from library.module_utils.network.f5.common import iControlUnexpectedHTTPError # In Ansible 2.8, Ansible changed import paths.
from test.unit.modules.utils import set_module_args 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_cli_script import ApiParameters from ansible.modules.network.f5.bigip_cli_script import ApiParameters
from ansible.modules.network.f5.bigip_cli_script import ModuleParameters from ansible.modules.network.f5.bigip_cli_script import ModuleParameters
from ansible.modules.network.f5.bigip_cli_script import ModuleManager from ansible.modules.network.f5.bigip_cli_script import ModuleManager
from ansible.modules.network.f5.bigip_cli_script import ArgumentSpec from ansible.modules.network.f5.bigip_cli_script import ArgumentSpec
from ansible.module_utils.network.f5.common import F5ModuleError
from ansible.module_utils.network.f5.common import iControlUnexpectedHTTPError # 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")