Skip to content
This repository was archived by the owner on Apr 7, 2022. It is now read-only.

Commit e6fd1d1

Browse files
committed
Add selector=ONE_PER_TYPE for action tests
1 parent ed56002 commit e6fd1d1

1 file changed

Lines changed: 37 additions & 16 deletions

File tree

cfme/tests/control/test_actions.py

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
from cfme.infrastructure.provider.rhevm import RHEVMProvider
2323
from cfme.infrastructure.provider.scvmm import SCVMMProvider
2424
from cfme.infrastructure.provider.virtualcenter import VMwareProvider
25+
from cfme.markers.env_markers.provider import ONE_PER_TYPE
2526
from cfme.tests.control import do_scan
2627
from cfme.tests.control import wait_for_ssa_enabled
2728
from cfme.utils.appliance.implementations.ui import navigate_to
@@ -180,7 +181,9 @@ def vm_off(vm):
180181

181182

182183
@pytest.mark.provider(
183-
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider], scope="module"
184+
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider],
185+
scope="module",
186+
selector=ONE_PER_TYPE
184187
)
185188
@pytest.mark.meta(blockers=[BZ(1531547)], automates=[1531547])
186189
def test_action_start_virtual_machine_after_stopping(request, vm, vm_on, policy_for_testing):
@@ -217,7 +220,9 @@ def _cleanup():
217220

218221

219222
@pytest.mark.provider(
220-
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider], scope="module"
223+
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider],
224+
scope="module",
225+
selector=ONE_PER_TYPE
221226
)
222227
def test_action_stop_virtual_machine_after_starting(request, vm, vm_off, policy_for_testing):
223228
""" This test tests action 'Stop Virtual Machine'
@@ -250,7 +255,9 @@ def _cleanup():
250255

251256

252257
@pytest.mark.provider(
253-
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider], scope="module"
258+
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider],
259+
scope="module",
260+
selector=ONE_PER_TYPE
254261
)
255262
def test_action_suspend_virtual_machine_after_starting(request, vm, vm_off, policy_for_testing):
256263
""" This test tests action 'Suspend Virtual Machine'
@@ -284,7 +291,9 @@ def _cleanup():
284291

285292

286293
@pytest.mark.provider(
287-
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider], scope="module"
294+
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider],
295+
scope="module",
296+
selector=ONE_PER_TYPE
288297
)
289298
def test_action_prevent_event(request, vm, vm_off, policy_for_testing):
290299
""" This test tests action 'Prevent current event from proceeding'
@@ -319,7 +328,9 @@ def _cleanup():
319328

320329

321330
@pytest.mark.provider(
322-
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider], scope="module"
331+
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider],
332+
scope="module",
333+
selector=ONE_PER_TYPE
323334
)
324335
@pytest.mark.meta(blockers=[BZ(1702018, forced_streams=["5.11"])], automates=[1702018])
325336
def test_action_prevent_vm_retire(request, vm, vm_on, policy_for_testing):
@@ -360,7 +371,7 @@ def _fail_func():
360371
pytest.fail(f"CFME did not prevent retire of the VM {vm.name}")
361372

362373

363-
@pytest.mark.provider([VMwareProvider], scope="module")
374+
@pytest.mark.provider([VMwareProvider], scope="module", selector=ONE_PER_TYPE)
364375
@pytest.mark.meta(automates=[1433084])
365376
def test_action_prevent_ssa(request, configure_fleecing, vm, vm_on, policy_for_testing):
366377
"""Tests preventing Smart State Analysis.
@@ -403,7 +414,7 @@ def _cleanup():
403414
pytest.fail(f"CFME did not prevent analysing the VM {vm.name}")
404415

405416

406-
@pytest.mark.provider([VMwareProvider, RHEVMProvider], scope="module")
417+
@pytest.mark.provider([VMwareProvider, RHEVMProvider], scope="module", selector=ONE_PER_TYPE)
407418
@pytest.mark.meta(automates=[1437910])
408419
def test_action_prevent_host_ssa(request, host, host_policy):
409420
"""Tests preventing Smart State Analysis on a host.
@@ -459,7 +470,9 @@ def _scan():
459470

460471

461472
@pytest.mark.provider(
462-
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider], scope="module"
473+
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider],
474+
scope="module",
475+
selector=ONE_PER_TYPE
463476
)
464477
def test_action_power_on_logged(request, vm, vm_off, policy_for_testing):
465478
""" This test tests action 'Generate log message'.
@@ -500,7 +513,9 @@ def _cleanup():
500513

501514

502515
@pytest.mark.provider(
503-
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider], scope="module"
516+
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider],
517+
scope="module",
518+
selector=ONE_PER_TYPE
504519
)
505520
def test_action_power_on_audit(request, vm, vm_off, policy_for_testing):
506521
""" This test tests action 'Generate Audit Event'.
@@ -539,7 +554,7 @@ def _cleanup():
539554
assert policy_result.validate("180s")
540555

541556

542-
@pytest.mark.provider([VMwareProvider, RHEVMProvider], scope="module")
557+
@pytest.mark.provider([VMwareProvider, RHEVMProvider], scope="module", selector=ONE_PER_TYPE)
543558
def test_action_create_snapshot_and_delete_last(appliance, request, vm, vm_on, policy_for_testing):
544559
""" This test tests actions 'Create a Snapshot' (custom) and 'Delete Most Recent Snapshot'.
545560
@@ -593,7 +608,7 @@ def finalize():
593608
)
594609

595610

596-
@pytest.mark.provider([VMwareProvider, RHEVMProvider], scope="module")
611+
@pytest.mark.provider([VMwareProvider, RHEVMProvider], scope="module", selector=ONE_PER_TYPE)
597612
@pytest.mark.meta(blockers=[BZ(1748410, forced_streams=["5.10"],
598613
unblock=lambda provider: provider.one_of(VMwareProvider))],
599614
automates=[1748410])
@@ -663,7 +678,7 @@ def create_one_snapshot(n):
663678
)
664679

665680

666-
@pytest.mark.provider([VMwareProvider], scope="module")
681+
@pytest.mark.provider([VMwareProvider], scope="module", selector=ONE_PER_TYPE)
667682
def test_action_initiate_smartstate_analysis(
668683
request, configure_fleecing, vm, vm_off, policy_for_testing
669684
):
@@ -735,7 +750,9 @@ def _cleanup():
735750

736751
# Purely custom actions
737752
@pytest.mark.provider(
738-
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider], scope="module"
753+
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider],
754+
scope="module",
755+
selector=ONE_PER_TYPE
739756
)
740757
def test_action_tag(request, vm, vm_off, policy_for_testing, appliance):
741758
""" Tests action tag
@@ -782,7 +799,9 @@ def finalize():
782799

783800

784801
@pytest.mark.provider(
785-
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider], scope="module"
802+
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider],
803+
scope="module",
804+
selector=ONE_PER_TYPE
786805
)
787806
def test_action_untag(request, vm, vm_off, policy_for_testing, appliance, tag):
788807
""" Tests action untag
@@ -838,7 +857,7 @@ def finalize():
838857
pytest.fail("Tags were not unassigned!")
839858

840859

841-
@pytest.mark.provider([VMwareProvider], scope="module")
860+
@pytest.mark.provider([VMwareProvider], scope="module", selector=ONE_PER_TYPE)
842861
@pytest.mark.meta(blockers=[BZ(1685201)])
843862
def test_action_cancel_clone(
844863
appliance, request, provider, vm_big, policy_for_testing, compliance_policy
@@ -896,7 +915,9 @@ def finalize():
896915

897916

898917
@pytest.mark.provider(
899-
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider], scope="module"
918+
[VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider],
919+
scope="module",
920+
selector=ONE_PER_TYPE
900921
)
901922
def test_action_check_compliance(
902923
request, vm, policy_for_testing, compliance_policy, compliance_condition, compliance_tag

0 commit comments

Comments
 (0)