Merge lp:~fginther/sudoku-app/fix-open-toolbar into lp:sudoku-app

Proposed by Francis Ginther on 2013-08-21
Status: Rejected
Rejected by: Alan Pope 🍺🐧🐱 πŸ¦„ on 2014-04-16
Proposed branch: lp:~fginther/sudoku-app/fix-open-toolbar
Merge into: lp:sudoku-app
Diff against target: 22 lines (+11/-0) (has conflicts)
1 file modified
tests/autopilot/sudoku_app/emulators/ubuntusdk.py (+11/-0)
Text conflict in tests/autopilot/sudoku_app/emulators/ubuntusdk.py
To merge this branch: bzr merge lp:~fginther/sudoku-app/fix-open-toolbar
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration 2013-08-21 Needs Fixing on 2013-08-23
Review via email: mp+181388@code.launchpad.net

Commit message

This is a MP for testing jenkins, PLEASE DO NOT MERGE.

Description of the change

This is a MP for testing jenkins, PLEASE DO NOT MERGE.

To post a comment you must log in.

Unmerged revisions

104. By Francis Ginther on 2013-08-20

Add animating wait_for to open_toolbar.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/sudoku_app/emulators/ubuntusdk.py'
2--- tests/autopilot/sudoku_app/emulators/ubuntusdk.py 2013-08-20 15:40:09 +0000
3+++ tests/autopilot/sudoku_app/emulators/ubuntusdk.py 2013-08-21 19:19:35 +0000
4@@ -119,7 +119,18 @@
5
6 def open_toolbar(self):
7 """Open the toolbar"""
8+<<<<<<< TREE
9 panel = self.app.select_single("Toolbar")
10+=======
11+ toolbar = self.get_toolbar()
12+ toolbar.animating.wait_for(False)
13+ if not toolbar.opened:
14+ self._drag_to_open_toolbar()
15+ toolbar.opened.wait_for(True)
16+ toolbar.animating.wait_for(False)
17+
18+ def _drag_to_open_toolbar(self):
19+>>>>>>> MERGE-SOURCE
20 qmlView = self.get_qml_view()
21
22 lineX = int(qmlView.x + qmlView.width * 0.50)

Subscribers

People subscribed via source and target branches