skip f5 tests when f5 lib not installed

pull/24457/head
Brian Coca 8 years ago
parent 8ad04d6348
commit 83703e3137

@ -22,8 +22,9 @@ __metaclass__ = type
import sys import sys
from nose.plugins.skip import SkipTest
if sys.version_info < (2, 7): if sys.version_info < (2, 7):
from nose.plugins.skip import SkipTest
raise SkipTest("F5 Ansible modules require Python >= 2.7") raise SkipTest("F5 Ansible modules require Python >= 2.7")
import os import os
@ -40,9 +41,12 @@ try:
from library.bigip_snmp import ModuleManager from library.bigip_snmp import ModuleManager
from library.bigip_snmp import ArgumentSpec from library.bigip_snmp import ArgumentSpec
except ImportError: except ImportError:
try:
from ansible.modules.network.f5.bigip_snmp import Parameters from ansible.modules.network.f5.bigip_snmp import Parameters
from ansible.modules.network.f5.bigip_snmp import ModuleManager from ansible.modules.network.f5.bigip_snmp import ModuleManager
from ansible.modules.network.f5.bigip_snmp import ArgumentSpec from ansible.modules.network.f5.bigip_snmp import ArgumentSpec
except ImportError:
raise SkipTest("F5 Ansible modules the f5 python library")
fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_data = {} fixture_data = {}

Loading…
Cancel
Save