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 #8253 from mshriver/fix-cfme_data-lookup
Browse files Browse the repository at this point in the history
[RFR] Fix cfme_data lookup in test_actions
  • Loading branch information
mshriver committed Dec 8, 2018
2 parents 665dc7e + 792bfe0 commit 20512e2
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion cfme/tests/control/test_actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,10 @@ def vddk_url(provider):
# cf. BZ 1651702 vddk_version 6_7 does not currently work with CFME, so use v6_5
if BZ(1651702, forced_streams=['5.9','5.10']).blocks:
vddk_version = "v6_5"
url = cfme_data.get("basic_info").get("vddk_url").get(vddk_version)
try:
url = conf.cfme_data.basic_info.vddk_url.get(vddk_version)
except (KeyError, AttributeError):
pytest.skip('VDDK URL/Version not found in cfme_data.basic_info')
if url is None:
pytest.skip("There is no vddk url for this VMware provider version")
else:
Expand Down

0 comments on commit 20512e2

Please sign in to comment.