From 399fc110e7be70605dc46480eb9f21caf99677ab Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Tue, 26 Mar 2019 10:53:21 -0700 Subject: [PATCH] Use pytest.mark.skip instead of pytest.skip. --- test/units/modules/storage/netapp/test_na_ontap_cluster.py | 2 +- test/units/modules/storage/netapp/test_na_ontap_nvme.py | 2 +- .../storage/netapp/test_na_ontap_vscan_on_access_policy.py | 2 +- .../modules/storage/netapp/test_na_ontap_vscan_scanner_pool.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/units/modules/storage/netapp/test_na_ontap_cluster.py b/test/units/modules/storage/netapp/test_na_ontap_cluster.py index d365b38915b..913344f101b 100644 --- a/test/units/modules/storage/netapp/test_na_ontap_cluster.py +++ b/test/units/modules/storage/netapp/test_na_ontap_cluster.py @@ -17,7 +17,7 @@ from ansible.modules.storage.netapp.na_ontap_cluster \ import NetAppONTAPCluster as my_module # module under test if not netapp_utils.has_netapp_lib(): - pytestmark = pytest.skip('skipping as missing required netapp_lib') + pytestmark = pytest.mark.skip('skipping as missing required netapp_lib') def set_module_args(args): diff --git a/test/units/modules/storage/netapp/test_na_ontap_nvme.py b/test/units/modules/storage/netapp/test_na_ontap_nvme.py index 7e85392e550..190cd8ab7f5 100644 --- a/test/units/modules/storage/netapp/test_na_ontap_nvme.py +++ b/test/units/modules/storage/netapp/test_na_ontap_nvme.py @@ -17,7 +17,7 @@ from ansible.modules.storage.netapp.na_ontap_nvme \ import NetAppONTAPNVMe as my_module if not netapp_utils.has_netapp_lib(): - pytestmark = pytest.skip('skipping as missing required netapp_lib') + pytestmark = pytest.mark.skip('skipping as missing required netapp_lib') def set_module_args(args): diff --git a/test/units/modules/storage/netapp/test_na_ontap_vscan_on_access_policy.py b/test/units/modules/storage/netapp/test_na_ontap_vscan_on_access_policy.py index 308548c529c..fc9d9129a8c 100644 --- a/test/units/modules/storage/netapp/test_na_ontap_vscan_on_access_policy.py +++ b/test/units/modules/storage/netapp/test_na_ontap_vscan_on_access_policy.py @@ -17,7 +17,7 @@ from ansible.modules.storage.netapp.na_ontap_vscan_on_access_policy \ import NetAppOntapVscanOnAccessPolicy as policy_module # module under test if not netapp_utils.has_netapp_lib(): - pytestmark = pytest.skip('skipping as missing required netapp_lib') + pytestmark = pytest.mark.skip('skipping as missing required netapp_lib') HAS_NETAPP_ZAPI_MSG = "pip install netapp_lib is required" diff --git a/test/units/modules/storage/netapp/test_na_ontap_vscan_scanner_pool.py b/test/units/modules/storage/netapp/test_na_ontap_vscan_scanner_pool.py index 974aceac5e3..3609e91ef86 100644 --- a/test/units/modules/storage/netapp/test_na_ontap_vscan_scanner_pool.py +++ b/test/units/modules/storage/netapp/test_na_ontap_vscan_scanner_pool.py @@ -17,7 +17,7 @@ from ansible.modules.storage.netapp.na_ontap_vscan_scanner_pool \ import NetAppOntapVscanScannerPool as scanner_module # module under test if not netapp_utils.has_netapp_lib(): - pytestmark = pytest.skip('skipping as missing required netapp_lib') + pytestmark = pytest.mark.skip('skipping as missing required netapp_lib') def set_module_args(args):