Merge lp:~osomon/webbrowser-app/fix-one-flaky-ap-test-1591120 into lp:webbrowser-app

Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 1479
Merged at revision: 1497
Proposed branch: lp:~osomon/webbrowser-app/fix-one-flaky-ap-test-1591120
Merge into: lp:webbrowser-app
Diff against target: 30 lines (+6/-5)
1 file modified
tests/autopilot/webbrowser_app/tests/test_new_tab_view.py (+6/-5)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/fix-one-flaky-ap-test-1591120
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+297494@code.launchpad.net

Commit message

Fix one flaky autopilot test.

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1479
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/536/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/622/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/622
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/592
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/592
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/585
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/585/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/585/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/585/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/585/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/585
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/585/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/585/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/536/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1479
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/552/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/754/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/754
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/701
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/701
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/701
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/693
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/693/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/693
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/693/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/693
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/693/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/693
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/693/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/693
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/693/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/693/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/693
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/693/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/693
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/693/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/693
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/693/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/552/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/webbrowser_app/tests/test_new_tab_view.py'
2--- tests/autopilot/webbrowser_app/tests/test_new_tab_view.py 2016-02-03 16:22:37 +0000
3+++ tests/autopilot/webbrowser_app/tests/test_new_tab_view.py 2016-06-15 16:32:55 +0000
4@@ -282,13 +282,14 @@
5 self.assertThat(bookmarks.count, Eventually(Equals(5)))
6 self.assertThat(top_sites.visible, Eventually(Equals(True)))
7
8- def _remove_first_bookmark(self):
9+ def _remove_first_bookmark(self, expect_count_change):
10 bookmark = self.new_tab_view.get_bookmark_delegates()[1]
11 url = bookmark.url
12 bookmark.trigger_leading_action("leadingAction.delete", lambda: None)
13- self.assertThat(
14- lambda: self.new_tab_view.get_bookmark_delegates()[1].url,
15- Eventually(NotEquals(url)))
16+ if expect_count_change:
17+ bookmark.wait_until_destroyed()
18+ else:
19+ self.assertThat(bookmark.url, Eventually(NotEquals(url)))
20
21 def _remove_first_bookmark_from_folder(self, folder):
22 folders = self.new_tab_view.get_bookmarks_folder_list_view()
23@@ -314,7 +315,7 @@
24 self.assertThat(bookmarks.count, Eventually(Equals(5)))
25 more_button = self.new_tab_view.get_bookmarks_more_button()
26 for i in range(3):
27- self._remove_first_bookmark()
28+ self._remove_first_bookmark(i == 2)
29 self.assertThat(more_button.visible, Eventually(Equals(i < 1)))
30 self.assertThat(bookmarks.count, Equals(5 if (i < 2) else 4))
31

Subscribers

People subscribed via source and target branches

to status/vote changes: