@@ -8,7 +8,7 @@
from time import sleep
-from selenium.common.exceptions import NoSuchElementException, StaleElementReferenceException, TimeoutException
+from selenium.common.exceptions import NoSuchElementException, StaleElementReferenceException, TimeoutException, WebDriverException
from selenium.webdriver.common.by import By
from orm.models import Build
@@ -66,12 +66,14 @@ def wait_until_build_cancelled(test_instance):
pass
if 'cancelled' in str(build_state).lower():
break
- except NoSuchElementException:
- continue
- except StaleElementReferenceException:
- continue
except TimeoutException:
break
+ except NoSuchElementException:
+ pass
+ except StaleElementReferenceException:
+ pass
+ except WebDriverException:
+ pass
start_time += 1
sleep(1) # take a breath and try again
Fix the exception handling in the cancel builds function. This involved adding WebDriverException which sometimes occurs but also correcting the other exception handlers to continue to increment the timeout to avoid test hangs. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- lib/toaster/tests/functional/utils.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)