Merge "Use _wait_for_spinner()"

This commit is contained in:
Jenkins 2015-03-30 11:33:04 +00:00 committed by Gerrit Code Review
commit 2f7a2dd891
3 changed files with 6 additions and 0 deletions

View File

@ -72,12 +72,14 @@ class FlavorsPage(basepage.BaseNavigationPage):
self.create_flavor_form.ephemeral_disk.value = ephemeral_disk self.create_flavor_form.ephemeral_disk.value = ephemeral_disk
self.create_flavor_form.swap_disk.value = swap_disk self.create_flavor_form.swap_disk.value = swap_disk
self.create_flavor_form.submit.click() self.create_flavor_form.submit.click()
self._wait_till_spinner_disappears()
def delete_flavor(self, name): def delete_flavor(self, name):
row = self._get_row_with_flavor_name(name) row = self._get_row_with_flavor_name(name)
row.mark() row.mark()
self.flavors_table.delete_flavors.click() self.flavors_table.delete_flavors.click()
self.confirm_delete_flavors_form.submit.click() self.confirm_delete_flavors_form.submit.click()
self._wait_till_spinner_disappears()
def is_flavor_present(self, name): def is_flavor_present(self, name):
return bool(self._get_row_with_flavor_name(name)) return bool(self._get_row_with_flavor_name(name))

View File

@ -71,12 +71,14 @@ class UsersPage(basepage.BaseNavigationPage):
self.create_user_form.project.text = project self.create_user_form.project.text = project
self.create_user_form.role.text = role self.create_user_form.role.text = role
self.create_user_form.submit.click() self.create_user_form.submit.click()
self._wait_till_spinner_disappears()
def delete_user(self, name): def delete_user(self, name):
row = self._get_row_with_user_name(name) row = self._get_row_with_user_name(name)
row.mark() row.mark()
self.users_table.delete_users.click() self.users_table.delete_users.click()
self.confirm_delete_users_form.submit.click() self.confirm_delete_users_form.submit.click()
self._wait_till_spinner_disappears()
def is_user_present(self, name): def is_user_present(self, name):
return bool(self._get_row_with_user_name(name)) return bool(self._get_row_with_user_name(name))

View File

@ -91,12 +91,14 @@ class ImagesPage(basepage.BaseNavigationPage):
if is_protected: if is_protected:
self.create_image_form.protected.mark() self.create_image_form.protected.mark()
self.create_image_form.submit.click() self.create_image_form.submit.click()
self._wait_till_spinner_disappears()
def delete_image(self, name): def delete_image(self, name):
row = self._get_row_with_image_name(name) row = self._get_row_with_image_name(name)
row.mark() row.mark()
self.images_table.delete_images.click() self.images_table.delete_images.click()
self.confirm_delete_images_form.submit.click() self.confirm_delete_images_form.submit.click()
self._wait_till_spinner_disappears()
def is_image_present(self, name): def is_image_present(self, name):
return bool(self._get_row_with_image_name(name)) return bool(self._get_row_with_image_name(name))