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

[1LP][RFR] Add BZ blocker for Azure chargeback / metering tests #10225

Merged
mshriver merged 1 commit into from
Jul 1, 2020
Merged

[1LP][RFR] Add BZ blocker for Azure chargeback / metering tests #10225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions cfme/tests/intelligence/reports/test_metering_report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from cfme.infrastructure.provider import InfraProvider
from cfme.infrastructure.provider.scvmm import SCVMMProvider
from cfme.markers.env_markers.provider import providers
from cfme.utils.blockers import GH
from cfme.utils.blockers import BZ
from cfme.utils.log import logger
from cfme.utils.providers import ProviderFilter
from cfme.utils.wait import wait_for
Expand All @@ -36,9 +36,8 @@
pytest.mark.tier(2),
pytest.mark.provider(gen_func=providers, filters=[cloud_and_infra, not_scvmm], scope='module'),
test_requirements.chargeback,
pytest.mark.meta(blockers=[
GH('ManageIQ/manageiq:20237', unblock=lambda provider: not provider.one_of(AzureProvider))
])
pytest.mark.meta(blockers=[BZ(1843942, forced_streams=['5.11'],
unblock=lambda provider: not provider.one_of(AzureProvider))])
]

# Allowed deviation between the reported value in the Metering report and the estimated value.
Expand Down
7 changes: 3 additions & 4 deletions cfme/tests/intelligence/reports/test_validate_chargeback_report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
from cfme.infrastructure.provider import InfraProvider
from cfme.infrastructure.provider.scvmm import SCVMMProvider
from cfme.markers.env_markers.provider import providers
from cfme.utils.blockers import GH
from cfme.utils.blockers import BZ
from cfme.utils.log import logger
from cfme.utils.providers import ProviderFilter
from cfme.utils.wait import wait_for
Expand All @@ -54,9 +54,8 @@
pytest.mark.provider(gen_func=providers, filters=[cloud_and_infra, not_scvmm], scope='module'),
pytest.mark.usefixtures('has_no_providers_modscope', 'setup_provider_modscope'),
test_requirements.chargeback,
pytest.mark.meta(blockers=[
GH('ManageIQ/manageiq:20237', unblock=lambda provider: not provider.one_of(AzureProvider))
])
pytest.mark.meta(blockers=[BZ(1843942, forced_streams=['5.11'],
unblock=lambda provider: not provider.one_of(AzureProvider))])
]

# Allowed deviation between the reported value in the Chargeback report and the estimated value.
Expand Down