From cbc85718094de7011ef322b7172408fd50d062cf Mon Sep 17 00:00:00 2001 From: Tim Rupp Date: Mon, 29 Oct 2018 10:41:35 -0700 Subject: [PATCH] Adds fixes to the bigiq unit tests (#47763) The tests were not working on ansible 2.8. This fixes that. --- .../test_bigiq_regkey_license_assignment.py | 27 ++++++++++++------- .../network/f5/test_bigiq_utility_license.py | 22 ++++++++------- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/test/units/modules/network/f5/test_bigiq_regkey_license_assignment.py b/test/units/modules/network/f5/test_bigiq_regkey_license_assignment.py index 0c1526cecdb..cd623c8c281 100644 --- a/test/units/modules/network/f5/test_bigiq_regkey_license_assignment.py +++ b/test/units/modules/network/f5/test_bigiq_regkey_license_assignment.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.bigiq_regkey_license_assignment import ModuleParameters from library.modules.bigiq_regkey_license_assignment import ModuleManager from library.modules.bigiq_regkey_license_assignment 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.bigiq_regkey_license_assignment import ApiParameters from ansible.modules.network.f5.bigiq_regkey_license_assignment import ModuleParameters from ansible.modules.network.f5.bigiq_regkey_license_assignment import ModuleManager from ansible.modules.network.f5.bigiq_regkey_license_assignment 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") @@ -102,6 +106,11 @@ class TestManager(unittest.TestCase): def setUp(self): self.spec = ArgumentSpec() + self.patcher1 = patch('time.sleep') + self.patcher1.start() + + def tearDown(self): + self.patcher1.stop() def test_create(self, *args): set_module_args(dict( diff --git a/test/units/modules/network/f5/test_bigiq_utility_license.py b/test/units/modules/network/f5/test_bigiq_utility_license.py index fe8365254ae..c07351c592e 100644 --- a/test/units/modules/network/f5/test_bigiq_utility_license.py +++ b/test/units/modules/network/f5/test_bigiq_utility_license.py @@ -8,32 +8,36 @@ __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: from library.modules.bigiq_utility_license import ModuleParameters from library.modules.bigiq_utility_license import ModuleManager from library.modules.bigiq_utility_license 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.bigiq_utility_license import ModuleParameters from ansible.modules.network.f5.bigiq_utility_license import ModuleManager from ansible.modules.network.f5.bigiq_utility_license 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")