From 359cbbb4d9447d79627eb19f6f7a4d2fe68706b7 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Wed, 3 Jul 2013 14:18:05 -0400 Subject: [PATCH] Fixing up ui_helpers based on feedback from Christina --- common/djangoapps/terrain/ui_helpers.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/djangoapps/terrain/ui_helpers.py b/common/djangoapps/terrain/ui_helpers.py index 08e2f04254..c238ff862a 100644 --- a/common/djangoapps/terrain/ui_helpers.py +++ b/common/djangoapps/terrain/ui_helpers.py @@ -73,9 +73,8 @@ def css_click(css_selector, index=0, max_attempts=5, success_condition=lambda: T for _ in range(max_attempts): try: world.css_find(css_selector)[index].click() - if not success_condition(): - raise Exception("unsuccessful click") - return + if success_condition(): + return except WebDriverException: # Occasionally, MathJax or other JavaScript can cover up # an element temporarily. @@ -118,6 +117,8 @@ def css_check(css_selector, index=0, max_attempts=5, success_condition=lambda: T else: # try once more, letting exceptions raise world.css_find(css_selector)[index].check() + if not success_condition(): + raise Exception("unsuccessful check") @world.absorb