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

[Olivier Tilloy]

10 seconds was too much, as it’s also the timeout threshold for the Eventually matcher that verifies that the page has loaded.
Lowering the page load time to 8 seconds should do the trick.

[Günter Schwann (schwann)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:208
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/185/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/756
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/68
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/68/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/758
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/758/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/681

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

review: Approve (continuous-integration)

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

212. By Olivier Tilloy on 2013-07-05

Disable the current webview while the activity view is visible, thus avoiding mouse events to go through.

Approved by PS Jenkins bot, Günter Schwann.

213. By Olivier Tilloy on 2013-07-05

10 seconds was too much, as it’s also the timeout threshold for the Eventually matcher that verifies that the page has loaded.
Lowering the page load time to 8 seconds should do the trick.

Approved by PS Jenkins bot, Günter Schwann.

=== modified file 'tests/autopilot/webbrowser_app/tests/test_progressbar.py'
--- tests/autopilot/webbrowser_app/tests/test_progressbar.py	2013-07-04 08:19:14 +0000
+++ tests/autopilot/webbrowser_app/tests/test_progressbar.py	2013-07-05 10:59:27 +0000
@@ -27,7 +27,7 @@
 
     def setUp(self):
         self.base_url = "http://localhost:%d" % HTTP_SERVER_PORT
-        self.url = self.base_url + "/wait/10"
+        self.url = self.base_url + "/wait/8"
         self.ARGS = [self.url]
         super(TestProgressBarAtStartup, self).setUp()