From 710ad554196c5cbcb0d9b431564cd77afb53fcce Mon Sep 17 00:00:00 2001 From: Jan Zmeskal Date: Fri, 7 Sep 2018 13:40:08 +0200 Subject: [PATCH] Fixing getting retiremnt state --- cfme/common/vm.py | 7 ++++++- cfme/tests/cloud_infra_common/test_retirement.py | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cfme/common/vm.py b/cfme/common/vm.py index 4b3b5ee0c1..8615645ce2 100644 --- a/cfme/common/vm.py +++ b/cfme/common/vm.py @@ -22,6 +22,7 @@ from cfme.utils.rest import assert_response from cfme.utils.timeutil import parsetime from cfme.utils.update import Updateable +from cfme.utils.version import LOWEST, VersionPicker from cfme.utils.virtual_machines import deploy_template from cfme.utils.wait import wait_for from . import PolicyProfileAssignable @@ -183,7 +184,11 @@ def is_retired(self): view = navigate_to(self, "Details", use_resetter=False) if view.entities.summary('Lifecycle').get_text_of('Retirement Date').lower() != 'never': try: - status = view.entities.summary('Lifecycle').get_text_of('Retirement state').lower() + retirement_state = VersionPicker({ + LOWEST: 'Retirement state', + '5.10': 'Retirement State' + }) + status = view.entities.summary('Lifecycle').get_text_of(retirement_state).lower() return status == 'retired' except NameError: return False diff --git a/cfme/tests/cloud_infra_common/test_retirement.py b/cfme/tests/cloud_infra_common/test_retirement.py index be9a07a65e..d7984d284b 100644 --- a/cfme/tests/cloud_infra_common/test_retirement.py +++ b/cfme/tests/cloud_infra_common/test_retirement.py @@ -19,6 +19,7 @@ pytestmark = [ pytest.mark.usefixtures('setup_provider'), + pytest.mark.meta(blockers=[BZ(1626971, forced_streams=['5.10'])]), pytest.mark.tier(1), pytest.mark.long_running, test_requirements.retirement,