Merge lp:~osomon/webbrowser-app/racy-ap-test-1456885 into lp:webbrowser-app

[Olivier Tilloy]

Fix a flaky autopilot test.
On a mobile device with network access, the URL (http://en.wikipedia.org/wiki/Linux) might be rewritten to https://en.m.wikipedia.org/wiki/Linux, thus making the test racy depending on when the check on the webview’s URL is performed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1018
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1796/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2888/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/553
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/553
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/553/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/553
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2475/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2886
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2886/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20638

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/autopilot/webbrowser_app/tests/test_suggestions.py'
--- tests/autopilot/webbrowser_app/tests/test_suggestions.py	2015-05-12 13:40:17 +0000
+++ tests/autopilot/webbrowser_app/tests/test_suggestions.py	2015-05-20 05:46:27 +0000
@@ -90,7 +90,7 @@
              "Livermorium - Element Information"),
             ("http://www.rsc.org/periodic-table/element/62/samarium",
              "Samarium - Element Information"),
-            ("http://en.wikipedia.org/wiki/Linux",
+            ("http://test/wiki/Linux",
              "Linux - Wikipedia, the free encyclopedia"),
             ("http://doc.qt.io/qt-5/qtqml-index.html",
              "Qt QML 5.4 - Qt Documentation")
@@ -264,7 +264,7 @@
         self.assert_suggestions_eventually_shown()
         self.assertThat(suggestions.count, Eventually(Equals(1)))
         entries = suggestions.get_ordered_entries()
-        url = "http://en.wikipedia.org/wiki/Linux"
+        url = "http://test/wiki/Linux"
         self.pointing_device.click_object(entries[0])
         webview = self.main_window.get_current_webview()
         self.assertThat(webview.url, Eventually(Equals(url)))