Unity

Merge lp:~azzar1/unity/unstable-tests-icons into lp:unity

  1. unstable-tests-icons
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 4026
Proposed branch: lp:~azzar1/unity/unstable-tests-icons
Merge into: lp:unity
Diff against target: 30 lines (+3/-3)
1 file modified
tests/test_icon_loader.cpp (+3/-3)
To merge this branch: bzr merge lp:~azzar1/unity/unstable-tests-icons
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Marco Trevisan (Treviño) Approve
Review via email: mp+274230@code.launchpad.net

Commit message

Avoid test failures on jenkins.

Description of the change

Disable some tests on jenkins.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Thanks

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

FAILED: Continuous integration, rev:4020
http://jenkins.qa.ubuntu.com/job/unity-ci/1318/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/96/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/94/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/94/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1318/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/test_icon_loader.cpp'
2--- tests/test_icon_loader.cpp 2015-09-30 20:59:26 +0000
3+++ tests/test_icon_loader.cpp 2015-10-13 10:13:44 +0000
4@@ -144,7 +144,7 @@
5 EXPECT_TRUE(IsValidPixbuf(load_result.pixbuf));
6 }
7
8-TEST_F(TestIconLoader, TestGetOneIconManyTimes)
9+TEST_F(TestIconLoader, UNSTABLE_TEST(TestGetOneIconManyTimes))
10 {
11 std::vector<LoadResult> results;
12 std::vector<IconLoader::Handle> handles;
13@@ -174,7 +174,7 @@
14 CheckResults(results);
15 }
16
17-TEST_F(TestIconLoader, TestGetManyIcons)
18+TEST_F(TestIconLoader, UNSTABLE_TEST(TestGetManyIcons))
19 {
20 std::vector<LoadResult> results;
21 int i = 0;
22@@ -196,7 +196,7 @@
23 CheckResults(results);
24 }
25
26-TEST_F(TestIconLoader, TestCancelSome)
27+TEST_F(TestIconLoader, UNSTABLE_TEST(TestCancelSome))
28 {
29 std::vector<LoadResult> results;
30 std::vector<IconLoader::Handle> handles;