Permalink
Browse files

Bug 1159674 - merge pull request #29794 from andreastt:bug_1159674 to…

… mozilla-b2g:master
  • Loading branch information...
mozilla-autolander-deprecated committed May 1, 2015
2 parents dbf8063 + 28cdb7e commit 8e64346ce8197b50b815a294278797bc144aa3e6
@@ -6,7 +6,7 @@
from marionette_driver import expected, By, Wait
from marionette_driver.marionette import Actions
from marionette_driver.errors import FrameSendFailureError
from marionette_driver.errors import FrameSendFailureError, NoSuchWindowException
from gaiatest.apps.base import Base
@@ -96,7 +96,7 @@ def tap_select_button(self):
try:
select.tap()
except FrameSendFailureError:
except (FrameSendFailureError, NoSuchWindowException):
# The frame may close for Marionette but that's expected so we can continue - Bug 1065933
pass
@@ -3,7 +3,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from marionette_driver import expected, By, Wait
from marionette_driver.errors import FrameSendFailureError
from marionette_driver.errors import FrameSendFailureError, NoSuchWindowException
from gaiatest.apps.base import Base
@@ -25,7 +25,7 @@ def tap_stop_alarm(self):
Wait(self.marionette).until(expected.element_displayed(stop_alarm_button))
try:
stop_alarm_button.tap()
except FrameSendFailureError:
except (FrameSendFailureError, NoSuchWindowException):
# The frame may close for Marionette but that's expected so we can continue - Bug 1065933
pass
@@ -6,7 +6,7 @@
import time
from marionette_driver import expected, By, Wait
from marionette_driver.errors import FrameSendFailureError
from marionette_driver.errors import FrameSendFailureError, NoSuchWindowException
from gaiatest.apps.base import Base
@@ -369,7 +369,7 @@ def a11y_click_next_to_finish_section(self):
def tap_skip_tour(self):
try:
self.marionette.find_element(*self._skip_tour_button_locator).tap()
except FrameSendFailureError:
except (FrameSendFailureError, NoSuchWindowException):
# The frame may close for Marionette but that's expected so we can continue - Bug 1065933
pass
@@ -456,6 +456,6 @@ def wait_for_finish_tutorial_section(self):
def tap_lets_go_button(self):
try:
self.marionette.find_element(*self._lets_go_button_locator).tap()
except FrameSendFailureError:
except (FrameSendFailureError, NoSuchWindowException):
# The frame may close for Marionette but that's expected so we can continue - Bug 1065933
pass
@@ -5,7 +5,7 @@
import time
from marionette_driver import expected, By, Wait
from marionette_driver.errors import FrameSendFailureError
from marionette_driver.errors import FrameSendFailureError, NoSuchWindowException
from gaiatest.apps.base import Base
@@ -30,7 +30,7 @@ def __init__(self, marionette):
def tap_crop_done(self):
try:
self.marionette.find_element(*self._crop_done_button_locator).tap()
except FrameSendFailureError:
except (FrameSendFailureError, NoSuchWindowException):
# The frame may close for Marionette but that's expected so we can continue - Bug 1065933
pass

0 comments on commit 8e64346

Please sign in to comment.