Skip to content

Commit

Permalink
[1LP][RFR] Replace usage of entity.check() with entity.ensure_checked…
Browse files Browse the repository at this point in the history
…. Part 1. (ManageIQ#9669)

* Replace check() with ensure_checked() in test_multiple_host_good_creds

* Remove pytest mark used for testing

* Update test_power_on_or_off_multiple to use ensure_checked()

* Replace entity.check() with entity.ensure_checked() in refresh_provider_relationships_ui

* Replace check() with ensure_checked() in cfme/tests/cloud_infra_common/test_vm_instance_analysis.py

* Replace check() with ensure_checked() in power_control_from_cfme

* Replace check() with ensure_checked() in PolicySimulationOnCollection

* Replace check() with ensure_checked() in Edit

* Replace check() with ensure_checked() in EditTags
  • Loading branch information
prichard77 authored and spusateri committed Jan 27, 2020
1 parent c47fc82 commit f6906eb
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 9 deletions.
5 changes: 3 additions & 2 deletions cfme/cloud/instance/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ def power_control_from_cfme(self, *args, **kwargs):
raise ItemNotFound(
'Failed to find instance in table: {}'.format(self.name)
)
row.check()
row.ensure_checked()

# cancel is the kwarg, when true we want item_select to dismiss the alert, flip the bool
view.toolbar.power.item_select(kwargs.get('option'),
Expand Down Expand Up @@ -643,7 +643,8 @@ def prerequisite(self):
def step(self, *args, **kwargs):
# click the checkbox of every object in the filtered collection
for entity in self.obj.all():
self.prerequisite_view.entities.get_entity(name=entity.name, surf_pages=True).check()
self.prerequisite_view.entities.get_entity(name=entity.name,
surf_pages=True).ensure_checked()
self.prerequisite_view.toolbar.policy.item_select("Policy Simulation")


Expand Down
6 changes: 4 additions & 2 deletions cfme/cloud/provider/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,8 @@ class Edit(CFMENavigateStep):
prerequisite = NavigateToSibling('All')

def step(self, *args, **kwargs):
self.prerequisite_view.entities.get_entity(name=self.obj.name, surf_pages=True).check()
self.prerequisite_view.entities.get_entity(name=self.obj.name,
surf_pages=True).ensure_checked()
try:
self.prerequisite_view.toolbar.configuration.item_select('Edit Selected Cloud Provider')
except MoveTargetOutOfBoundsException:
Expand All @@ -289,7 +290,8 @@ class EditTags(CFMENavigateStep):
prerequisite = NavigateToSibling('All')

def step(self, *args, **kwargs):
self.prerequisite_view.entities.get_entity(name=self.obj.name, surf_pages=True).check()
self.prerequisite_view.entities.get_entity(name=self.obj.name,
surf_pages=True).ensure_checked()
try:
self.prerequisite_view.toolbar.policy.item_select('Edit Tags')
except MoveTargetOutOfBoundsException:
Expand Down
2 changes: 1 addition & 1 deletion cfme/common/provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ def refresh_provider_relationships_ui(self, from_list_view=False, wait=0, delay=
if from_list_view:
view = navigate_to(self, 'All')
entity = view.entities.get_entity(name=self.name, surf_pages=True)
entity.check()
entity.ensure_checked()

else:
view = navigate_to(self, 'Details')
Expand Down
4 changes: 2 additions & 2 deletions cfme/tests/cloud/test_instance_power_control.py
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@ def _get_view_with_icons_checked():
view = navigate_to(testing_instance.parent, 'All')
view.toolbar.view_selector.select('Grid View')
view.paginator.set_items_per_page(1000)
view.entities.get_entity(name=testing_instance.name).check()
view.entities.get_entity(name=testing_instance2.name).check()
view.entities.get_entity(name=testing_instance.name).ensure_checked()
view.entities.get_entity(name=testing_instance2.name).ensure_checked()
return view

# Power 2 instances off
Expand Down
2 changes: 1 addition & 1 deletion cfme/tests/cloud_infra_common/test_vm_instance_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,7 @@ def test_ssa_multiple_vms(ssa_multiple_vms, soft_assert, appliance, compare_linu
view.toolbar.view_selector.select('List View')
view.paginator.set_items_per_page(1000)
for ssa_vm in ssa_multiple_vms:
view.entities.get_entity(name=ssa_vm.name, surf_pages=True).check()
view.entities.get_entity(name=ssa_vm.name, surf_pages=True).ensure_checked()
# run SSA for all created vms
view.toolbar.configuration.item_select('Perform SmartState Analysis', handle_alert=True)
view.flash.assert_message('Analysis initiated for 3 VMs and Instances from the CFME Database')
Expand Down
2 changes: 1 addition & 1 deletion cfme/tests/infrastructure/test_host.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def navigate_and_select_quads(provider):
view: the provider nodes view, quadicons already selected"""
hosts_view = navigate_to(provider, 'ProviderNodes')
assert hosts_view.is_displayed
[h.check() for h in hosts_view.entities.get_all()]
[h.ensure_checked() for h in hosts_view.entities.get_all()]

hosts_view.toolbar.configuration.item_select('Edit Selected items')
edit_view = provider.create_view(HostsEditView)
Expand Down

0 comments on commit f6906eb

Please sign in to comment.