Merge lp:~osomon/webbrowser-app/increase-test-timeout into lp:webbrowser-app

[Olivier Tilloy]

Increase the timeout for assert_page_eventually_loaded to make tests more reliable
when in a slow environment.

[Günter Schwann (schwann)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:295
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/292/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2856
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/445
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/175
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/175
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/175/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/175
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2862
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2862/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2425
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/447
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/447/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/401
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/408

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/292/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/webbrowser-app-autolanding/162/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2859
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/448/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-autolanding/106
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-autolanding/106/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-autolanding/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2865
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2865/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2428
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/450/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[lp:~osomon/webbrowser-app/increase-test-timeout]

295. By Olivier Tilloy on 2013-09-02

Increase the timeout for assert_page_eventually_loaded to make tests more reliable
when in a slow environment.

Approved by PS Jenkins bot, Günter Schwann.

=== modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
--- tests/autopilot/webbrowser_app/tests/__init__.py	2013-08-29 16:28:44 +0000
+++ tests/autopilot/webbrowser_app/tests/__init__.py	2013-09-02 11:09:49 +0000
@@ -177,7 +177,8 @@
         webview = self.main_window.get_current_webview()
         self.assertThat(webview.url, Eventually(Equals(url)))
         # loadProgress == 100 ensures that a page has actually loaded
-        self.assertThat(webview.loadProgress, Eventually(Equals(100)))
+        self.assertThat(webview.loadProgress,
+                        Eventually(Equals(100), timeout=20))
         self.assertThat(webview.loading, Eventually(Equals(False)))