use is_element_visible instead of try except

mozilla · Mar 30, 2012 · 37e7efb · 37e7efb
1 parent 6e3f172
commit 37e7efb
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/pages/desktop/login_page.py b/pages/desktop/login_page.py
@@ -42,12 +42,7 @@ def log_in(self, user='default'):
         self.selenium.find_element(*self._password_box_locator).send_keys(credentials['password'])
         self.selenium.find_element(*self._log_in_button_locator).click()
 
-        error = ""
+        if self.is_element_visible(*self._login_error_locator):
-        try:
             error = self.selenium.find_element(*self._login_error_locator).text
-        except NoSuchElementException, ElementNotVisibleException:
+            error = "login failed for %s\n" % credentials['name'] + error
-            '''no error, do nothing'''
+            Assert.fail(error)
-        finally:
-            if error != "":
-                error = "login failed for %s\n" % credentials['name'] + error
-                Assert.fail(error)