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

[Francis Ginther]

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

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

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:104
http://91.189.93.70:8080/job/sudoku-app-ci/2/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-precise-amd64-ci/2/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-quantal-amd64-ci/2/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-raring-amd64-ci/2/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-saucy-amd64-ci/2/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/sudoku-app-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:104
http://91.189.93.70:8080/job/sudoku-app-ci/2/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/10/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-precise-amd64-ci/2/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-quantal-amd64-ci/2/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-raring-amd64-ci/2/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-saucy-amd64-ci/2/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/sudoku-app-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:104
http://91.189.93.70:8080/job/sudoku-app-ci/4/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/34/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-precise-amd64-ci/4/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-quantal-amd64-ci/4/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-raring-amd64-ci/4/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-saucy-amd64-ci/4/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/sudoku-app-ci/4/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

104. By Francis Ginther on 2013-08-20

Add animating wait_for to open_toolbar.

=== modified file 'tests/autopilot/sudoku_app/emulators/ubuntusdk.py'
--- tests/autopilot/sudoku_app/emulators/ubuntusdk.py	2013-08-20 15:40:09 +0000
+++ tests/autopilot/sudoku_app/emulators/ubuntusdk.py	2013-08-21 19:19:35 +0000
@@ -119,7 +119,18 @@
 
     def open_toolbar(self):
         """Open the toolbar"""
+<<<<<<< TREE
         panel = self.app.select_single("Toolbar")
+=======
+        toolbar = self.get_toolbar()
+        toolbar.animating.wait_for(False)
+        if not toolbar.opened:
+            self._drag_to_open_toolbar()
+            toolbar.opened.wait_for(True)
+            toolbar.animating.wait_for(False)
+
+    def _drag_to_open_toolbar(self):
+>>>>>>> MERGE-SOURCE
         qmlView = self.get_qml_view()
 
         lineX = int(qmlView.x + qmlView.width * 0.50)