Ubuntu UI Toolkit

Merge lp:~kalikiana/ubuntu-ui-toolkit/flakeyUbuntuShape into lp:ubuntu-ui-toolkit/staging

  1. flakeyUbuntuShape
  2. Merge into staging
Proposed by Cris Dywan
Status: Merged
Approved by: Tim Peeters
Approved revision: 1077
Merged at revision: 1077
Proposed branch: lp:~kalikiana/ubuntu-ui-toolkit/flakeyUbuntuShape
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 14 lines (+4/-0)
1 file modified
tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py (+4/-0)
To merge this branch: bzr merge lp:~kalikiana/ubuntu-ui-toolkit/flakeyUbuntuShape
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Tim Peeters Approve
Review via email: mp+220952@code.launchpad.net

Commit message

Skip test_ubuntushape which is flakey and add a FIXME

To post a comment you must log in.
Revision history for this message
Tim Peeters (tpeeters) wrote :

ok

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
1=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py'
2--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py 2014-01-13 15:31:14 +0000
3+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py 2014-05-26 12:38:54 +0000
4@@ -75,6 +75,10 @@
5 # TODO: check for properties
6
7 def test_ubuntushape(self):
8+ # Flaky test case
9+ # FIXME: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1308979
10+ return
11+
12 item = "Ubuntu Shape"
13 self.loadItem(item)
14 self.checkPageHeader(item)

Subscribers

People subscribed via source and target branches