@@ -64,7 +64,7 @@ class TestLayerDetailsPage(SeleniumTestCase):
args=(self.project.pk,
self.imported_layer_version.pk))
- def _edit_layerdetails(self):
+ def test_edit_layerdetails_page(self):
""" Edit all the editable fields for the layer refresh the page and
check that the new values exist"""
@@ -107,17 +107,10 @@ class TestLayerDetailsPage(SeleniumTestCase):
for save_btn in self.find_all(".change-btn"):
save_btn.click()
- try:
- self.wait_until_visible("#save-changes-for-switch")
- btn_save_chg_for_switch = self.wait_until_clickable(
- "#save-changes-for-switch")
- btn_save_chg_for_switch.click()
- except ElementClickInterceptedException:
- self.skipTest(
- "save-changes-for-switch click intercepted. Element not visible or maybe covered by another element.")
- except TimeoutException:
- self.skipTest(
- "save-changes-for-switch is not clickable within the specified timeout.")
+ self.wait_until_visible("#save-changes-for-switch")
+ btn_save_chg_for_switch = self.wait_until_clickable(
+ "#save-changes-for-switch")
+ btn_save_chg_for_switch.click()
self.wait_until_visible("#edit-layer-source")
@@ -147,17 +140,10 @@ class TestLayerDetailsPage(SeleniumTestCase):
new_dir = "/home/test/my-meta-dir"
dir_input.send_keys(new_dir)
- try:
- self.wait_until_visible("#save-changes-for-switch")
- btn_save_chg_for_switch = self.wait_until_clickable(
- "#save-changes-for-switch")
- btn_save_chg_for_switch.click()
- except ElementClickInterceptedException:
- self.skipTest(
- "save-changes-for-switch click intercepted. Element not properly visible or maybe behind another element.")
- except TimeoutException:
- self.skipTest(
- "save-changes-for-switch is not clickable within the specified timeout.")
+ self.wait_until_visible("#save-changes-for-switch")
+ btn_save_chg_for_switch = self.wait_until_clickable(
+ "#save-changes-for-switch")
+ btn_save_chg_for_switch.click()
self.wait_until_visible("#edit-layer-source")
@@ -168,12 +154,6 @@ class TestLayerDetailsPage(SeleniumTestCase):
"Expected %s in the dir value for layer directory" %
new_dir)
- def test_edit_layerdetails_page(self):
- try:
- self._edit_layerdetails()
- except ElementClickInterceptedException:
- self.skipTest(
- "ElementClickInterceptedException occured. Element not visible or maybe covered by another element.")
def test_delete_layer(self):
""" Delete the layer """
We really don't want to be skipping a test like this, drop the exception handling code as in my testing we thankfully no longer seem to be seeing it. If we do again we need to fix the underlying issue. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- .../tests/browser/test_layerdetails_page.py | 38 +++++-------------- 1 file changed, 9 insertions(+), 29 deletions(-)