bigip tests now skipped if missing lib

test/units/modules/network/f5/test_bigip_command.py

@@ -40,9 +40,14 @@ try:
     from library.bigip_command import ModuleManager
     from library.bigip_command import ArgumentSpec
 except ImportError:
-    from ansible.modules.network.f5.bigip_command import Parameters
+    try:
-    from ansible.modules.network.f5.bigip_command import ModuleManager
+        from ansible.modules.network.f5.bigip_command import Parameters
-    from ansible.modules.network.f5.bigip_command import ArgumentSpec
+        from ansible.modules.network.f5.bigip_command import ModuleManager
+        from ansible.modules.network.f5.bigip_command import ArgumentSpec
+    except ImportError:
+        from nose.plugins.skip import SkipTest
+        raise SkipTest("%s requires the python modules for f5/bigip" % __file__)
+
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 

test/units/modules/network/f5/test_bigip_config.py

@@ -40,9 +40,13 @@ try:
     from library.bigip_config import ModuleManager
     from library.bigip_config import ArgumentSpec
 except ImportError:
-    from ansible.modules.network.f5.bigip_config import Parameters
+    try:
-    from ansible.modules.network.f5.bigip_config import ModuleManager
+        from ansible.modules.network.f5.bigip_config import Parameters
-    from ansible.modules.network.f5.bigip_config import ArgumentSpec
+        from ansible.modules.network.f5.bigip_config import ModuleManager
+        from ansible.modules.network.f5.bigip_config import ArgumentSpec
+    except ImportError:
+        from nose.plugins.skip import SkipTest
+        raise SkipTest("%s requires the python modules for f5/bigip" % __file__)
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 

test/units/modules/network/f5/test_bigip_gtm_pool.py

@@ -42,11 +42,16 @@ try:
     from library.bigip_gtm_pool import UntypedManager
     from library.bigip_gtm_pool import TypedManager
 except ImportError:
-    from ansible.modules.network.f5.bigip_gtm_pool import Parameters
+    try:
-    from ansible.modules.network.f5.bigip_gtm_pool import ModuleManager
+        from ansible.modules.network.f5.bigip_gtm_pool import Parameters
-    from ansible.modules.network.f5.bigip_gtm_pool import ArgumentSpec
+        from ansible.modules.network.f5.bigip_gtm_pool import ModuleManager
-    from ansible.modules.network.f5.bigip_gtm_pool import UntypedManager
+        from ansible.modules.network.f5.bigip_gtm_pool import ArgumentSpec
-    from ansible.modules.network.f5.bigip_gtm_pool import TypedManager
+        from ansible.modules.network.f5.bigip_gtm_pool import UntypedManager
+        from ansible.modules.network.f5.bigip_gtm_pool import TypedManager
+    except ImportError:
+        from nose.plugins.skip import SkipTest
+        raise SkipTest("%s requires the python modules for f5/bigip" % __file__)
+
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}

test/units/modules/network/f5/test_bigip_pool.py

@@ -42,9 +42,14 @@ try:
     from library.bigip_pool import ModuleManager
     from library.bigip_pool import ArgumentSpec
 except ImportError:
-    from ansible.modules.network.f5.bigip_pool import Parameters
+    try:
-    from ansible.modules.network.f5.bigip_pool import ModuleManager
+        from ansible.modules.network.f5.bigip_pool import Parameters
-    from ansible.modules.network.f5.bigip_pool import ArgumentSpec
+        from ansible.modules.network.f5.bigip_pool import ModuleManager
+        from ansible.modules.network.f5.bigip_pool import ArgumentSpec
+    except ImportError:
+        from nose.plugins.skip import SkipTest
+        raise SkipTest("%s requires the python modules for f5/bigip" % __file__)
+
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}

test/units/modules/network/f5/test_bigip_snmp_trap.py

@@ -43,12 +43,17 @@ try:
     from library.bigip_snmp_trap import NonNetworkedManager
     from library.bigip_snmp_trap import ArgumentSpec
 except ImportError:
-    from ansible.modules.network.f5.bigip_snmp_trap import NetworkedParameters
+    try:
-    from ansible.modules.network.f5.bigip_snmp_trap import NonNetworkedParameters
+        from ansible.modules.network.f5.bigip_snmp_trap import NetworkedParameters
-    from ansible.modules.network.f5.bigip_snmp_trap import ModuleManager
+        from ansible.modules.network.f5.bigip_snmp_trap import NonNetworkedParameters
-    from ansible.modules.network.f5.bigip_snmp_trap import NetworkedManager
+        from ansible.modules.network.f5.bigip_snmp_trap import ModuleManager
-    from ansible.modules.network.f5.bigip_snmp_trap import NonNetworkedManager
+        from ansible.modules.network.f5.bigip_snmp_trap import NetworkedManager
-    from ansible.modules.network.f5.bigip_snmp_trap import ArgumentSpec
+        from ansible.modules.network.f5.bigip_snmp_trap import NonNetworkedManager
+        from ansible.modules.network.f5.bigip_snmp_trap import ArgumentSpec
+    except ImportError:
+        from nose.plugins.skip import SkipTest
+        raise SkipTest("%s requires the python modules for f5/bigip" % __file__)
+
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}

test/units/modules/network/f5/test_bigip_user.py

@@ -45,11 +45,16 @@ try:
     from library.bigip_user import UnparitionedManager
     from library.bigip_user import PartitionedManager
 except ImportError:
-    from ansible.modules.network.f5.bigip_user import Parameters
+    try:
-    from ansible.modules.network.f5.bigip_user import ModuleManager
+        from ansible.modules.network.f5.bigip_user import Parameters
-    from ansible.modules.network.f5.bigip_user import ArgumentSpec
+        from ansible.modules.network.f5.bigip_user import ModuleManager
-    from ansible.modules.network.f5.bigip_user import UnparitionedManager
+        from ansible.modules.network.f5.bigip_user import ArgumentSpec
-    from ansible.modules.network.f5.bigip_user import PartitionedManager
+        from ansible.modules.network.f5.bigip_user import UnparitionedManager
+        from ansible.modules.network.f5.bigip_user import PartitionedManager
+    except ImportError:
+        from nose.plugins.skip import SkipTest
+        raise SkipTest("%s requires the python modules for f5/bigip" % __file__)
+
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}