Merge lp:~ted/indicator-sound/test-failures into lp:indicator-sound/14.04

Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 436
Merged at revision: 436
Proposed branch: lp:~ted/indicator-sound/test-failures
Merge into: lp:indicator-sound/14.04
Diff against target: 21 lines (+2/-2)
1 file modified
tests/media-player-user.cc (+2/-2)
To merge this branch: bzr merge lp:~ted/indicator-sound/test-failures
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+212655@code.launchpad.net

Commit message

Don't unref the objects in the test

Description of the change

Uhg, not sure why we don't get ref's in these functions, but we don't. Err, vala.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

That must've been a fun one to track down.

The GIcon* returned by g_app_info_get_icon (GAppInfo *appinfo) is [transfer none], so GLib.AppInfo.get_icon()'s return value is unowned.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/media-player-user.cc'
2--- tests/media-player-user.cc 2014-03-04 21:24:10 +0000
3+++ tests/media-player-user.cc 2014-03-25 15:58:12 +0000
4@@ -163,7 +163,7 @@
5 GIcon * out_icon = media_player_get_icon(MEDIA_PLAYER(player));
6 EXPECT_NE(nullptr, out_icon);
7 EXPECT_TRUE(g_icon_equal(in_icon, out_icon));
8- g_clear_object(&out_icon);
9+ // NOTE: No reference in 'out_icon' returned
10
11 MediaPlayerTrack * track = media_player_get_current_track(MEDIA_PLAYER(player));
12 EXPECT_NE(nullptr, track);
13@@ -171,7 +171,7 @@
14 EXPECT_STREQ("Bansky", media_player_track_get_artist(track));
15 EXPECT_STREQ("Vinyl is dead", media_player_track_get_album(track));
16 EXPECT_STREQ("http://art.url", media_player_track_get_art_url(track));
17- g_clear_object(&track);
18+ // NOTE: No reference in 'track' returned
19
20 g_clear_object(&in_icon);
21 g_clear_object(&player);

Subscribers

People subscribed via source and target branches