internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes ansible unit tests for bigip_software_install (#48025)

Browse Source
This commit is contained in:
Tim Rupp
2018-11-02 22:20:54 -07:00
committed by GitHub
parent 5afe77933b
commit 6b14bab750
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ansible/modules/network/f5/bigip_software_install.py
View File

@@ -12,7 +12,6 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
'status': ['preview'], 'status': ['preview'],
'supported_by': 'certified'} 'supported_by': 'certified'}
DOCUMENTATION = r''' DOCUMENTATION = r'''
--- ---
module: bigip_software_install module: bigip_software_install

22
test/units/modules/network/f5/test_bigip_software_install.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_software_install import ModuleParameters from library.modules.bigip_software_install import ModuleParameters
from library.modules.bigip_software_install import ModuleManager from library.modules.bigip_software_install import ModuleManager
from library.modules.bigip_software_install import ArgumentSpec from library.modules.bigip_software_install 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_software_install import ApiParameters from ansible.modules.network.f5.bigip_software_install import ApiParameters
from ansible.modules.network.f5.bigip_software_install import ModuleParameters from ansible.modules.network.f5.bigip_software_install import ModuleParameters
from ansible.modules.network.f5.bigip_software_install import ModuleManager from ansible.modules.network.f5.bigip_software_install import ModuleManager
from ansible.modules.network.f5.bigip_software_install import ArgumentSpec from ansible.modules.network.f5.bigip_software_install 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")