Merge lp:~nskaggs/ubuntu-calendar-app/addingWaitTime into lp:ubuntu-calendar-app

Proposed by Nicholas Skaggs
Status: Merged
Approved by: Mihir Soni
Approved revision: 488
Merged at revision: 485
Proposed branch: lp:~nskaggs/ubuntu-calendar-app/addingWaitTime
Merge into: lp:ubuntu-calendar-app
Diff against target: 44 lines (+5/-5)
1 file modified
tests/autopilot/calendar_app/__init__.py (+5/-5)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-calendar-app/addingWaitTime
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Mihir Soni Approve
Nicholas Skaggs Pending
Review via email: mp+236602@code.launchpad.net

This proposal supersedes a proposal from 2014-09-30.

Commit message

Adding wait time to Event Page & Delete Confirmation to prevent AP fails.

Description of the change

Adding wait time to Event Page & Delete Confirmation to prevent AP fails.

To post a comment you must log in.
Revision history for this message
Nicholas Skaggs (nskaggs) wrote : Posted in a previous version of this proposal

<balloons> mihir_, I would add root.wait_select_single(DayView, objectName='dayViewPage') in as well in the delete method
<balloons> hmm
<balloons> mihir_, also, return root.select_single(NewEvent, objectName='newEventPage') to a wait
<balloons> that's in edit ^^

In addition, I would add a wait to

        return self.get_root_instance().select_single(
            EventDetails, objectName='eventDetails')

review: Needs Fixing
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Just finishing this for mihir.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~nskaggs/ubuntu-calendar-app/addingWaitTime/+merge/236602/+edit-commit-message

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
488. By Nicholas Skaggs

fix wait selects

Revision history for this message
Mihir Soni (mihirsoni) wrote :

Looks good to me
Thanks Balloons :)

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/calendar_app/__init__.py'
2--- tests/autopilot/calendar_app/__init__.py 2014-09-23 15:09:07 +0000
3+++ tests/autopilot/calendar_app/__init__.py 2014-09-30 20:55:49 +0000
4@@ -123,7 +123,7 @@
5 """
6 header = self.get_header()
7 header.click_action_button('neweventbutton')
8- return self.select_single(NewEvent, objectName='newEventPage')
9+ return self.wait_select_single(NewEvent, objectName='newEventPage')
10
11 def set_picker(self, field, mode, value):
12 # open picker
13@@ -491,7 +491,7 @@
14 center_y = self.globalRect.y + self.globalRect.height // 2
15 self.pointing_device.move(left, center_y)
16 self.pointing_device.click()
17- return self.get_root_instance().select_single(
18+ return self.get_root_instance().wait_select_single(
19 EventDetails, objectName='eventDetails')
20
21
22@@ -654,11 +654,11 @@
23 header = root.select_single(MainView).get_header()
24 header.click_action_button('delete')
25
26- delete_confirmation_dialog = root.select_single(
27+ delete_confirmation_dialog = root.wait_select_single(
28 DeleteConfirmationDialog, objectName='deleteConfirmationDialog')
29 delete_confirmation_dialog.confirm_deletion()
30
31- return root.select_single(DayView, objectName='dayViewPage')
32+ return root.wait_select_single(DayView, objectName='dayViewPage')
33
34 @autopilot.logging.log_action(logger.debug)
35 def edit(self):
36@@ -670,7 +670,7 @@
37 root = self.get_root_instance()
38 header = root.select_single(MainView).get_header()
39 header.click_action_button('edit')
40- return root.select_single(NewEvent, objectName='newEventPage')
41+ return root.wait_select_single(NewEvent, objectName='newEventPage')
42
43 def get_event_information(self):
44 """Return the information of the event."""

Subscribers

People subscribed via source and target branches

to status/vote changes: