Skip to content

Commit 9451fc8

Browse files
authored
remove unsupported vmware7 test for fips (#22138)
1 parent 914ef51 commit 9451fc8

2 files changed

Lines changed: 20 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
@@ -22,7 +22,7 @@
2222
@pytest.mark.e2e
2323
@pytest.mark.upgrade
2424
@pytest.mark.parametrize('vmware', ['vmware7', 'vmware8'], indirect=True)
25-
def test_positive_vmware_cr_end_to_end(target_sat, module_org, module_location, vmware):
25+
def test_positive_vmware_cr_end_to_end(request, target_sat, module_org, module_location, vmware):
2626
"""Create, Read, Update and Delete VMware compute resources
2727
2828
:id: 96faae3f-bc64-4147-a9fc-09c858e0a68f
@@ -33,8 +33,12 @@ def test_positive_vmware_cr_end_to_end(target_sat, module_org, module_location,
3333
3434
:BZ: 1387917
3535
36+
:Verifies: SAT-44626
37+
3638
:CaseImportance: Critical
3739
"""
40+
if 'vmware7' in request.node.callspec.id and target_sat.is_fips_enabled():
41+
pytest.skip('VMware 7 is not supported in FIPS mode')
3842
cr_name = gen_string('alpha')
3943
# Create
4044
vmware_cr = target_sat.cli.ComputeResource.create(

tests/foreman/ui/test_computeresource_vmware.py

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

103103
@pytest.mark.e2e
104104
@pytest.mark.parametrize('vmware', ['vmware7', 'vmware8'], indirect=True)
105-
def test_positive_cr_end_to_end(session, module_org, module_location, vmware, module_target_sat):
105+
def test_positive_cr_end_to_end(
106+
request, session, module_org, module_location, vmware, module_target_sat
107+
):
106108
"""Perform end-to-end testing for compute resource VMware component.
107109
108110
:id: 47fc9e77-5b22-46b4-a76c-3217434fde2f
109111
110112
:expectedresults: All expected CRUD actions finished successfully.
113+
114+
:Verifies: SAT-44626
111115
"""
116+
if 'vmware7' in request.node.callspec.id and module_target_sat.is_fips_enabled():
117+
pytest.skip('VMware 7 is not supported in FIPS mode')
112118
cr_name = gen_string('alpha')
113119
new_cr_name = gen_string('alpha')
114120
description = gen_string('alpha')
@@ -208,13 +214,17 @@ def test_positive_retrieve_virtual_machine_list(session, vmware):
208214

209215
@pytest.mark.e2e
210216
@pytest.mark.parametrize('vmware', ['vmware7', 'vmware8'], indirect=True)
211-
def test_positive_image_end_to_end(session, target_sat, vmware):
217+
def test_positive_image_end_to_end(request, session, target_sat, vmware):
212218
"""Perform end to end testing for compute resource VMware component image.
213219
214220
:id: 6b7949ef-c684-40aa-b181-11f8d4cd39c6
215221
216222
:expectedresults: All expected CRUD actions finished successfully.
223+
224+
:Verifies: SAT-44626
217225
"""
226+
if 'vmware7' in request.node.callspec.id and target_sat.is_fips_enabled():
227+
pytest.skip('VMware 7 is not supported in FIPS mode')
218228
cr_name = gen_string('alpha')
219229
image_name = gen_string('alpha')
220230
new_image_name = gen_string('alpha')
@@ -328,8 +338,10 @@ def test_positive_vmware_custom_profile_end_to_end(
328338
329339
:BZ: 1315277
330340
331-
:Verifies: SAT-31447
341+
:Verifies: SAT-31447, SAT-44626
332342
"""
343+
if 'vmware7' in request.node.callspec.id and target_sat.is_fips_enabled():
344+
pytest.skip('VMware 7 is not supported in FIPS mode')
333345
cr_name = gen_string('alpha')
334346
guest_os_names = [
335347
'Red Hat Enterprise Linux 7 (64-bit)',

0 commit comments

Comments
 (0)