From 37e7efbce55baaf2c032f5ef84fa4834d0dfbbd5 Mon Sep 17 00:00:00 2001 From: Leah Klearman Date: Fri, 30 Mar 2012 12:49:20 -0700 Subject: [PATCH] use is_element_visible instead of try except --- pages/desktop/login_page.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pages/desktop/login_page.py b/pages/desktop/login_page.py index 36a19ee..738f530 100644 --- 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 = "" - try: + if self.is_element_visible(*self._login_error_locator): error = self.selenium.find_element(*self._login_error_locator).text - except NoSuchElementException, ElementNotVisibleException: - '''no error, do nothing''' - finally: - if error != "": - error = "login failed for %s\n" % credentials['name'] + error - Assert.fail(error) \ No newline at end of file + error = "login failed for %s\n" % credentials['name'] + error + Assert.fail(error)