Adds token cleanup and fixes unit tests (#48493)

This commit is contained in:
Tim Rupp
2018-11-10 14:40:14 -08:00
committed by GitHub
parent 1afbe4d61b
commit 7d11e6e3e5
2 changed files with 17 additions and 11 deletions

View File

@@ -15,9 +15,6 @@ 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 +22,25 @@ try:
from library.modules.bigip_firewall_rule import ModuleParameters
from library.modules.bigip_firewall_rule import ModuleManager
from library.modules.bigip_firewall_rule 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_firewall_rule import ApiParameters
from ansible.modules.network.f5.bigip_firewall_rule import ModuleParameters
from ansible.modules.network.f5.bigip_firewall_rule import ModuleManager
from ansible.modules.network.f5.bigip_firewall_rule 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")
@@ -100,8 +105,6 @@ class TestParameters(unittest.TestCase):
assert p.logging is True
@patch('ansible.module_utils.f5_utils.AnsibleF5Client._get_mgmt_root',
return_value=True)
class TestManager(unittest.TestCase):
def setUp(self):