From 6b14bab7507ba5fb8fe4ed3ddd2fd4ecc4574b7f Mon Sep 17 00:00:00 2001 From: Tim Rupp Date: Fri, 2 Nov 2018 22:20:54 -0700 Subject: [PATCH] Fixes ansible unit tests for bigip_software_install (#48025) --- .../network/f5/bigip_software_install.py | 1 - .../network/f5/test_bigip_software_install.py | 22 +++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/lib/ansible/modules/network/f5/bigip_software_install.py b/lib/ansible/modules/network/f5/bigip_software_install.py index 93e888e4be7..f8b91c97367 100644 --- a/lib/ansible/modules/network/f5/bigip_software_install.py +++ b/lib/ansible/modules/network/f5/bigip_software_install.py @@ -12,7 +12,6 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], 'supported_by': 'certified'} - DOCUMENTATION = r''' --- module: bigip_software_install diff --git a/test/units/modules/network/f5/test_bigip_software_install.py b/test/units/modules/network/f5/test_bigip_software_install.py index 5e3e7e0f9ff..e12d738945f 100644 --- a/test/units/modules/network/f5/test_bigip_software_install.py +++ b/test/units/modules/network/f5/test_bigip_software_install.py @@ -8,16 +8,12 @@ __metaclass__ = type import os import json -import pytest import sys from nose.plugins.skip import SkipTest if sys.version_info < (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 try: @@ -25,17 +21,25 @@ try: from library.modules.bigip_software_install import ModuleParameters from library.modules.bigip_software_install import ModuleManager 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 - 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: try: 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 ModuleManager 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 except ImportError: raise SkipTest("F5 Ansible modules require the f5-sdk Python library")