Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/armedFlakes into lp:ubuntu-ui-toolkit/staging

Proposed by Cris Dywan
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 1845
Merged at revision: 1846
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/armedFlakes
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 41 lines (+9/-8)
1 file modified
tests/unit_x11/tst_components/tst_pagehead_visible.qml (+9/-8)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/armedFlakes
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Timo Jyrinki Approve
Review via email: mp+285713@code.launchpad.net

Commit message

Skip tst_pagehead_visible flakes on non-arm

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Ok, this biting us a lot at the moment. If we manage to keep it enabled on arm, it's something as it's the main target platform.

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
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/unit_x11/tst_components/tst_pagehead_visible.qml'
2--- tests/unit_x11/tst_components/tst_pagehead_visible.qml 2016-02-03 13:11:05 +0000
3+++ tests/unit_x11/tst_components/tst_pagehead_visible.qml 2016-02-11 12:41:38 +0000
4@@ -187,10 +187,9 @@
5 }
6
7 function test_set_visible_to_hide_and_show() {
8- // FIXME: Don't skip the test on i386, bug #1541385
9- if(TestExtras.openGLflavor() == "opengl" &&
10- TestExtras.cpuArchitecture() == "i386")
11- skip("This test fails on i386");
12+ // FIXME: Don't skip the test on i386/ amd64, bug #1541385
13+ if(TestExtras.cpuArchitecture() != "arm")
14+ skip("This test is flaky on non-arm right now.");
15 page.head.visible = false;
16 wait_for_visible(false, "Cannot hide unlocked header by setting visible to false.");
17 page.head.visible = true;
18@@ -204,10 +203,9 @@
19 }
20
21 function test_scroll_when_unlocked_updates_visible() {
22- // FIXME: Don't skip the test on i386, bug #1541385
23- if(TestExtras.openGLflavor() == "opengl" &&
24- TestExtras.cpuArchitecture() == "i386")
25- skip("This test fails on i386");
26+ // FIXME: Don't skip the test on i386/ amd64, bug #1541385
27+ if(TestExtras.cpuArchitecture() != "arm")
28+ skip("This test is flaky on non-arm right now.");
29 scroll_down();
30 wait_for_visible(false, "Scrolling down does not hide header.");
31 scroll_up();
32@@ -215,6 +213,9 @@
33 }
34
35 function test_scroll_when_locked_does_not_update_visible() {
36+ // FIXME: Don't skip the test on i386/ amd64, bug #1541385
37+ if(TestExtras.cpuArchitecture() != "arm")
38+ skip("This test is flaky on non-arm right now.");
39 // Note that with a locked header, scrolling up and down does not
40 // cause the header to move, so the wait_for_visible() calls below
41 // will return almost instantly.

Subscribers

People subscribed via source and target branches