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

Commit

Permalink
Merge pull request #8159 from jan-zmeskal/two_gh_for_ssa_vm
Browse files Browse the repository at this point in the history
[1LP][RFR][NOTEST] Blocking test_vm_instance_analysis.py with GH8152
  • Loading branch information
izapolsk committed Nov 19, 2018
2 parents ef189a1 + 28f3ef1 commit 279c5f0
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions cfme/tests/cloud_infra_common/test_vm_instance_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@
from cfme.provisioning import do_vm_provisioning
from cfme.utils import ssh, safe_string, testgen
from cfme.utils.appliance.implementations.ui import navigate_to
from cfme.utils.blockers import BZ
from cfme.utils.blockers import BZ, GH
from cfme.utils.conf import credentials
from cfme.utils.log import logger
from cfme.utils.virtual_machines import deploy_template
from cfme.utils.wait import wait_for, wait_for_decorator

pytestmark = [
pytest.mark.tier(3),
pytest.mark.meta(blockers=[GH('ManageIQ/integration_tests:8152')]),
test_requirements.smartstate,
]

Expand Down Expand Up @@ -624,11 +625,7 @@ def test_ssa_schedule(ssa_vm, schedule_ssa, soft_assert, vm_system_type):
@pytest.mark.rhv1
@pytest.mark.tier(2)
@pytest.mark.long_running
@pytest.mark.meta(blockers=[
BZ(1551273, forced_streams=['5.8', '5.9'],
unblock=lambda provider: not provider.one_of(RHEVMProvider)),
BZ(1578792, forced_streams=['5.8', '5.9'],
unblock=lambda provider: vm_system_type != 'redhat')])
@pytest.mark.meta(blockers=[GH('ManageIQ/integration_tests:8157')])
def test_ssa_vm(ssa_vm, soft_assert, vm_system_type):
""" Tests SSA can be performed and returns sane results
Expand Down

0 comments on commit 279c5f0

Please sign in to comment.