Skip to content

Commit 1e03553

Browse files
authored
remove unsupported vmware7 test for fips (#22135)
1 parent ce410df commit 1e03553

2 files changed

Lines changed: 21 additions & 4 deletions

File tree

tests/foreman/cli/test_computeresource_vmware.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
@pytest.mark.e2e
2424
@pytest.mark.upgrade
2525
@pytest.mark.parametrize('vmware', ['vmware7', 'vmware8'], indirect=True)
26-
def test_positive_vmware_cr_end_to_end(target_sat, module_org, module_location, vmware):
26+
def test_positive_vmware_cr_end_to_end(request, target_sat, module_org, module_location, vmware):
2727
"""Create, Read, Update and Delete VMware compute resources
2828
2929
:id: 96faae3f-bc64-4147-a9fc-09c858e0a68f
@@ -34,8 +34,12 @@ def test_positive_vmware_cr_end_to_end(target_sat, module_org, module_location,
3434
3535
:BZ: 1387917
3636
37+
:Verifies: SAT-44626
38+
3739
:CaseImportance: Critical
3840
"""
41+
if 'vmware7' in request.node.callspec.id and target_sat.is_fips_enabled():
42+
pytest.skip('VMware 7 is not supported in FIPS mode')
3943
cr_name = gen_string('alpha')
4044
# Create
4145
vmware_cr = target_sat.cli.ComputeResource.create(

tests/foreman/ui/test_computeresource_vmware.py

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,19 @@ def get_vmware_storagepod_summary_string(vmware, vmwareclient):
104104

105105
@pytest.mark.e2e
106106
@pytest.mark.parametrize('vmware', ['vmware7', 'vmware8'], indirect=True)
107-
def test_positive_cr_end_to_end(session, module_org, module_location, vmware, module_target_sat):
107+
def test_positive_cr_end_to_end(
108+
request, session, module_org, module_location, vmware, module_target_sat
109+
):
108110
"""Perform end-to-end testing for compute resource VMware component.
109111
110112
:id: 47fc9e77-5b22-46b4-a76c-3217434fde2f
111113
112114
:expectedresults: All expected CRUD actions finished successfully.
115+
116+
:Verifies: SAT-44626
113117
"""
118+
if 'vmware7' in request.node.callspec.id and module_target_sat.is_fips_enabled():
119+
pytest.skip('VMware 7 is not supported in FIPS mode')
114120
cr_name = gen_string('alpha')
115121
new_cr_name = gen_string('alpha')
116122
description = gen_string('alpha')
@@ -210,13 +216,18 @@ def test_positive_retrieve_virtual_machine_list(session, vmware):
210216

211217
@pytest.mark.e2e
212218
@pytest.mark.parametrize('vmware', ['vmware7', 'vmware8'], indirect=True)
213-
def test_positive_image_end_to_end(session, target_sat, vmware):
219+
def test_positive_image_end_to_end(request, session, target_sat, vmware):
214220
"""Perform end to end testing for compute resource VMware component image.
215221
216222
:id: 6b7949ef-c684-40aa-b181-11f8d4cd39c6
217223
218224
:expectedresults: All expected CRUD actions finished successfully.
225+
226+
:Verifies: SAT-44626
219227
"""
228+
if 'vmware7' in request.node.callspec.id and target_sat.is_fips_enabled():
229+
pytest.skip('VMware 7 is not supported in FIPS mode')
230+
220231
cr_name = gen_string('alpha')
221232
image_name = gen_string('alpha')
222233
new_image_name = gen_string('alpha')
@@ -330,8 +341,10 @@ def test_positive_vmware_custom_profile_end_to_end(
330341
331342
:BZ: 1315277
332343
333-
:verifies: SAT-31447
344+
:verifies: SAT-31447, SAT-44626
334345
"""
346+
if 'vmware7' in request.node.callspec.id and target_sat.is_fips_enabled():
347+
pytest.skip('VMware 7 is not supported in FIPS mode')
335348
cr_name = gen_string('alpha')
336349
guest_os_names = [
337350
'Red Hat Enterprise Linux 7 (64-bit)',

0 commit comments

Comments
 (0)