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
=== modified file 'tests/media-player-user.cc'
--- tests/media-player-user.cc 2014-03-04 21:24:10 +0000
+++ tests/media-player-user.cc 2014-03-25 15:58:12 +0000
@@ -163,7 +163,7 @@
163 GIcon * out_icon = media_player_get_icon(MEDIA_PLAYER(player));163 GIcon * out_icon = media_player_get_icon(MEDIA_PLAYER(player));
164 EXPECT_NE(nullptr, out_icon);164 EXPECT_NE(nullptr, out_icon);
165 EXPECT_TRUE(g_icon_equal(in_icon, out_icon));165 EXPECT_TRUE(g_icon_equal(in_icon, out_icon));
166 g_clear_object(&out_icon);166 // NOTE: No reference in 'out_icon' returned
167167
168 MediaPlayerTrack * track = media_player_get_current_track(MEDIA_PLAYER(player));168 MediaPlayerTrack * track = media_player_get_current_track(MEDIA_PLAYER(player));
169 EXPECT_NE(nullptr, track);169 EXPECT_NE(nullptr, track);
@@ -171,7 +171,7 @@
171 EXPECT_STREQ("Bansky", media_player_track_get_artist(track));171 EXPECT_STREQ("Bansky", media_player_track_get_artist(track));
172 EXPECT_STREQ("Vinyl is dead", media_player_track_get_album(track));172 EXPECT_STREQ("Vinyl is dead", media_player_track_get_album(track));
173 EXPECT_STREQ("http://art.url", media_player_track_get_art_url(track));173 EXPECT_STREQ("http://art.url", media_player_track_get_art_url(track));
174 g_clear_object(&track);174 // NOTE: No reference in 'track' returned
175175
176 g_clear_object(&in_icon);176 g_clear_object(&in_icon);
177 g_clear_object(&player);177 g_clear_object(&player);

Subscribers

People subscribed via source and target branches