Merge lp:~osomon/webbrowser-app/really-assert-eventually-loaded into lp:webbrowser-app

Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 133
Merged at revision: 133
Proposed branch: lp:~osomon/webbrowser-app/really-assert-eventually-loaded
Merge into: lp:webbrowser-app
Diff against target: 11 lines (+1/-0)
1 file modified
tests/autopilot/webbrowser_app/tests/__init__.py (+1/-0)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/really-assert-eventually-loaded
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Omer Akram (community) Approve
Review via email: mp+164436@code.launchpad.net

Commit message

Really assert that a given page has eventually been loaded.
This should fix intermittent failures when run on jenkins.

To post a comment you must log in.
Revision history for this message
Omer Akram (om26er) wrote :

+1 looks good.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

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-05-16 07:54:11 +0000
+++ tests/autopilot/webbrowser_app/tests/__init__.py 2013-05-17 15:46:40 +0000
@@ -144,6 +144,7 @@
144 def assert_page_eventually_loaded(self, url):144 def assert_page_eventually_loaded(self, url):
145 webview = self.main_window.get_web_view()145 webview = self.main_window.get_web_view()
146 self.assertThat(webview.url, Eventually(Equals(url)))146 self.assertThat(webview.url, Eventually(Equals(url)))
147 self.assertThat(webview.loading, Eventually(Equals(False)))
147148
148149
149class StartOpenLocalPageTestCaseBase(BrowserTestCaseBase):150class StartOpenLocalPageTestCaseBase(BrowserTestCaseBase):

Subscribers

People subscribed via source and target branches

to status/vote changes: