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

[1LP][RFR ] - Fix testcase #10341

Merged
merged 1 commit into from Nov 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions cfme/tests/infrastructure/test_vm_migrate.py
Expand Up @@ -5,6 +5,7 @@
from cfme.infrastructure.provider.rhevm import RHEVMProvider
from cfme.infrastructure.provider.virtualcenter import VMwareProvider
from cfme.utils.appliance.implementations.ui import navigate_to
from cfme.utils.blockers import BZ
from cfme.utils.log_validator import LogValidator


Expand All @@ -16,6 +17,17 @@
]


@pytest.mark.meta(
blockers=[
BZ(
1879912,
forced_streams=["5.11"],
unblock=lambda provider: (
not (provider.one_of(RHEVMProvider) and provider.version == 4.2)
),
)
]
)
def test_vm_migrate(appliance, create_vm, provider):
"""Tests migration of a vm

Expand Down
2 changes: 1 addition & 1 deletion cfme/tests/test_replication.py
Expand Up @@ -93,8 +93,8 @@ def test_replication_powertoggle(request, provider, setup_replication, small_tem
instance_name = fauxfactory.gen_alphanumeric(start="test_replication_", length=25).lower()
remote_app, global_app = setup_replication

provider_app_crud(OpenStackProvider, remote_app).setup()
provider.appliance = remote_app
provider.setup()

remote_instance = remote_app.collections.cloud_instances.instantiate(
instance_name, provider, small_template.name
Expand Down