Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/workaround_intel_autopilot_failure into lp:ubuntu-ui-toolkit

[Timo Jyrinki]

Try to workaround an autopilot failure on a slow Intel machine (LP: #1180226)

Try to workaround an autopilot failure on a slow Intel machine (LP: #1180226)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:493
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/59/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/59

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/59/rebuild

review: Approve (continuous-integration)

[lp:~timo-jyrinki/ubuntu-ui-toolkit/workaround_intel_autopilot_failure]

494. By Timo Jyrinki on 2013-05-16

as discussed on IRC with zsombi, try sleep(0) first

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:494
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/62

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/62/rebuild

review: Approve (continuous-integration)

[lp:~timo-jyrinki/ubuntu-ui-toolkit/workaround_intel_autopilot_failure]

495. By Timo Jyrinki on 2013-05-17

compromise, sleep(1)...

[Timo Jyrinki (timo-jyrinki)]

Since it looks like a graphics related real delay, not some cache thing etc. I believe trying sleep(1) is better.

Furthermore, it may be possible to get direct access temporarily to a similar machine as the autopilot-intel machine, but it's not trivial. Therefore I'd like to first try if this patch changes anything, and if not then try other options.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:495
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/65/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/65

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/65/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-14 04:02:03 +0000
+++ debian/changelog	2013-05-17 04:45:32 +0000
@@ -1,4 +1,4 @@
-ubuntu-ui-toolkit (0.1.46daily13.05.14ubuntu.unity.next-0ubuntu1) raring; urgency=low
+ubuntu-ui-toolkit (0.1.46daily13.05.14ubuntu.unity.next-0ubuntu1~test1) raring; urgency=low
 
   [ Zsombor Egri ]
   * [Theming] custom styling objects which are owned by other styled

=== modified file 'tests/autopilot/UbuntuUiToolkit/tests/gallery/test_gallery.py'
--- tests/autopilot/UbuntuUiToolkit/tests/gallery/test_gallery.py	2013-05-13 07:37:40 +0000
+++ tests/autopilot/UbuntuUiToolkit/tests/gallery/test_gallery.py	2013-05-17 04:45:32 +0000
@@ -12,6 +12,7 @@
 from testtools.matchers import Is, Not, Equals
 from testtools import skip
 import os
+import time
 from UbuntuUiToolkit.tests import UbuntuUiToolkitTestCase
 from UbuntuUiToolkit.emulators.main_window import MainWindow
 
@@ -63,6 +64,11 @@
         # scroll view to expose more items
         self.drag("Icons","Text Field")
 
+        # Wait for the scrolling to finish, the next click fails on the 
+        # slower Intel machine but succeeds on AMD and NVIDIA.
+        # (LP: #1180226)
+        time.sleep(1)
+
         # now that we have more items, lets continue
         items = [
                         "Dialog",