Fixes unit tests for bigip_software_image (#48026)

This commit is contained in:
Tim Rupp 2018-11-02 22:20:24 -07:00 committed by GitHub
parent a90bf9fb32
commit b45b2b3cc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

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_image import ModuleParameters from library.modules.bigip_software_image import ModuleParameters
from library.modules.bigip_software_image import ModuleManager from library.modules.bigip_software_image import ModuleManager
from library.modules.bigip_software_image import ArgumentSpec from library.modules.bigip_software_image 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_image import ApiParameters from ansible.modules.network.f5.bigip_software_image import ApiParameters
from ansible.modules.network.f5.bigip_software_image import ModuleParameters from ansible.modules.network.f5.bigip_software_image import ModuleParameters
from ansible.modules.network.f5.bigip_software_image import ModuleManager from ansible.modules.network.f5.bigip_software_image import ModuleManager
from ansible.modules.network.f5.bigip_software_image import ArgumentSpec from ansible.modules.network.f5.bigip_software_image 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")