Merge lp:~osomon/gallery-app/wait-for-confirm-dialogue into lp:gallery-app

Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 891
Merged at revision: 892
Proposed branch: lp:~osomon/gallery-app/wait-for-confirm-dialogue
Merge into: lp:gallery-app
Diff against target: 28 lines (+3/-1)
1 file modified
tests/autopilot/gallery_app/tests/test_photo_viewer.py (+3/-1)
To merge this branch: bzr merge lp:~osomon/gallery-app/wait-for-confirm-dialogue
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+199076@code.launchpad.net

Commit message

Fix a flaky test by always waiting for the confirmation dialogue to be fully visible before interacting with it.

To post a comment you must log in.
Revision history for this message
Olivier Tilloy (osomon) wrote :
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
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/gallery_app/tests/test_photo_viewer.py'
2--- tests/autopilot/gallery_app/tests/test_photo_viewer.py 2013-11-04 03:27:55 +0000
3+++ tests/autopilot/gallery_app/tests/test_photo_viewer.py 2013-12-16 07:50:49 +0000
4@@ -79,7 +79,7 @@
5 def test_photo_delete_works(self):
6 """Clicking the trash button must show the delete dialog."""
7 self.main_view.open_toolbar().click_button("deleteButton")
8- delete_dialog = self.get_delete_dialog()
9+ self.get_delete_dialog()
10
11 photo_viewer = self.photo_viewer.get_main_photo_viewer()
12
13@@ -91,6 +91,7 @@
14 Eventually(Equals(True)))
15
16 self.main_view.open_toolbar().click_button("deleteButton")
17+ self.get_delete_dialog()
18
19 delete_item = self.photo_viewer.get_delete_popover_delete_item()
20 self.click_item(delete_item)
21@@ -100,6 +101,7 @@
22 Eventually(Equals(False)))
23
24 self.main_view.open_toolbar().click_button("deleteButton")
25+ self.get_delete_dialog()
26
27 delete_item = self.photo_viewer.get_delete_popover_delete_item()
28 self.click_item(delete_item)

Subscribers

People subscribed via source and target branches