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

Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: no longer in the source branch.
Merged at revision: 295
Proposed branch: lp:~osomon/webbrowser-app/increase-test-timeout
Merge into: lp:webbrowser-app
Diff against target: 11 lines (+2/-1)
1 file modified
tests/autopilot/webbrowser_app/tests/__init__.py (+2/-1)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/increase-test-timeout
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Günter Schwann (community) Approve
Review via email: mp+183425@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Günter Schwann (schwann) wrote :

lgtm

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
295. By Olivier Tilloy

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
177 webview = self.main_window.get_current_webview()177 webview = self.main_window.get_current_webview()
178 self.assertThat(webview.url, Eventually(Equals(url)))178 self.assertThat(webview.url, Eventually(Equals(url)))
179 # loadProgress == 100 ensures that a page has actually loaded179 # loadProgress == 100 ensures that a page has actually loaded
180 self.assertThat(webview.loadProgress, Eventually(Equals(100)))180 self.assertThat(webview.loadProgress,
181 Eventually(Equals(100), timeout=20))
181 self.assertThat(webview.loading, Eventually(Equals(False)))182 self.assertThat(webview.loading, Eventually(Equals(False)))
182183
183184

Subscribers

People subscribed via source and target branches

to status/vote changes: