Commit 95b66d13 authored by Zac's avatar Zac
Browse files

Merge pull request #15975 from zacc/bug_968131 

Bug 968131 - Tackle intermittent in test_clock_add_alarm_multiple_times
parents 6b6d7f9d 571a8c97

tests/python/gaia-ui-tests/gaiatest/apps/clock/app.py

+1 −2
Changes for tests/python/gaia-ui-tests/gaiatest/apps/clock/app.py: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ class Clock(Base): 
    def dismiss_banner(self):

        self.wait_for_element_displayed(

            *self._banner_countdown_notification_locator)

        self.marionette.find_element(

            *self._banner_countdown_notification_locator).tap()

        # We can't tap to clear the banner as sometimes it taps the underlying alarm changing the UI

        self.wait_for_element_not_displayed(

            *self._banner_countdown_notification_locator)

tests/python/gaia-ui-tests/gaiatest/apps/clock/regions/alarm.py

+1 −1
Changes for tests/python/gaia-ui-tests/gaiatest/apps/clock/regions/alarm.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ class NewAlarm(Clock): 
        self.wait_for_condition(lambda m: view.location['x'] == 0)



    def type_alarm_label(self, value):

        self.marionette.find_element(*self._alarm_name_locator).clear()

        self.marionette.find_element(*self._alarm_name_locator).tap()

        self.keyboard.send(value)

        self.keyboard.dismiss()

tests/python/gaia-ui-tests/gaiatest/tests/functional/clock/test_clock_add_alarm_multiple_times.py

+1 −0
Changes for tests/python/gaia-ui-tests/gaiatest/tests/functional/clock/test_clock_add_alarm_multiple_times.py: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ class TestClockAddAlarmMultipleTimes(GaiaTestCase): 


            # create a new alarm with the default values that are available

            new_alarm = self.clock.tap_new_alarm()

            new_alarm.type_alarm_label(' '.join(['alarm', str(i)]))

            new_alarm.tap_done()



            # verify the banner-countdown message appears