Fix several leaks in tests
All of these are specific to tests, not the library code.
For the moment, `protocol_xfer` still leaks connections (and anything they hold on to) because it is very difficult to disentangle them from the connection manager in the partially implemented state they are in.
This fixes leaks of options in the account option test (these two leaks occur for every test since they all leak the option):
```
61 (48 direct, 13 indirect) bytes in 1 blocks are definitely lost in loss record 133 of 276
at 0x4848464: calloc (vg_replace_malloc.c:1340)
by 0x49F75F0: g_malloc0 (gmem.c:163)
by 0x48C3B2E: purple_account_option_new (purpleaccountoption.c:78)
by 0x4014AF: test_purple_account_option_copy_int (test_account_option.c:67)
by 0x4A1CC7D: UnknownInlinedFun (gtestutils.c:2933)
by 0x4A1CC7D: g_test_run_suite_internal (gtestutils.c:3021)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1D181: g_test_run_suite (gtestutils.c:3115)
by 0x4A156EC: UnknownInlinedFun (gtestutils.c:2234)
by 0x4A156EC: g_test_run (gtestutils.c:2221)
by 0x401721: main (test_account_option.c:157)
61 (48 direct, 13 indirect) bytes in 1 blocks are definitely lost in loss record 134 of 276
at 0x4848464: calloc (vg_replace_malloc.c:1340)
by 0x49F75F0: g_malloc0 (gmem.c:163)
by 0x48C3BC7: purple_account_option_copy (purpleaccountoption.c:93)
by 0x4014BF: test_purple_account_option_copy_int (test_account_option.c:68)
by 0x4A1CC7D: UnknownInlinedFun (gtestutils.c:2933)
by 0x4A1CC7D: g_test_run_suite_internal (gtestutils.c:3021)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1D181: g_test_run_suite (gtestutils.c:3115)
by 0x4A156EC: UnknownInlinedFun (gtestutils.c:2234)
by 0x4A156EC: g_test_run (gtestutils.c:2221)
by 0x401721: main (test_account_option.c:157)
```
leaks in the credential manager test (times 3 for read/write/cancel tests):
```
69 (16 direct, 53 indirect) bytes in 1 blocks are definitely lost in loss record 2,427 of 3,503
at 0x484386F: malloc (vg_replace_malloc.c:393)
by 0x4A58168: g_malloc (gmem.c:130)
by 0x4A6FAB5: g_slice_alloc (gslice.c:1074)
by 0x4A700EC: g_slice_alloc0 (gslice.c:1100)
by 0x4A3BECB: g_error_allocate (gerror.c:710)
by 0x4A3C93F: UnknownInlinedFun (gerror.c:724)
by 0x4A3C93F: g_error_new_valist (gerror.c:766)
by 0x4BEE558: g_task_return_new_error (gtask.c:1941)
by 0x48D82C0: purple_credential_manager_read_password_async (purplecredentialmanager.c:492)
by 0x403634: test_purple_credential_manager_no_provider_read_password_idle (test_credential_manager.c:329)
by 0x4A4ECB1: g_idle_dispatch (gmain.c:6124)
by 0x4A4FCBE: UnknownInlinedFun (gmain.c:3444)
by 0x4A4FCBE: g_main_context_dispatch (gmain.c:4162)
by 0x4AA5597: g_main_context_iterate.constprop.0 (gmain.c:4238)
by 0x4A4F28E: g_main_loop_run (gmain.c:4438)
by 0x40369F: test_purple_credential_manager_no_provider_read_password_async (test_credential_manager.c:345)
by 0x4A7DC7D: UnknownInlinedFun (gtestutils.c:2933)
by 0x4A7DC7D: g_test_run_suite_internal (gtestutils.c:3021)
by 0x4A7D9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A7D9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A7E181: g_test_run_suite (gtestutils.c:3115)
by 0x4A766EC: UnknownInlinedFun (gtestutils.c:2234)
by 0x4A766EC: g_test_run (gtestutils.c:2221)
by 0x4048F6: main (test_credential_manager.c:695)
```
a leak in the image test:
```
161 bytes in 1 blocks are definitely lost in loss record 260 of 274
at 0x484386F: malloc (vg_replace_malloc.c:393)
by 0x4A55363: g_try_malloc (gmem.c:286)
by 0x4A3D630: UnknownInlinedFun (gfileutils.c:819)
by 0x4A3D630: UnknownInlinedFun (gfileutils.c:924)
by 0x4A3D630: g_file_get_contents (gfileutils.c:1027)
by 0x401890: test_image_new_from_file (test_image.c:144)
by 0x4A7DC7D: UnknownInlinedFun (gtestutils.c:2933)
by 0x4A7DC7D: g_test_run_suite_internal (gtestutils.c:3021)
by 0x4A7D9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A7E181: g_test_run_suite (gtestutils.c:3115)
by 0x4A766EC: UnknownInlinedFun (gtestutils.c:2234)
by 0x4A766EC: g_test_run (gtestutils.c:2221)
by 0x40195D: main (test_image.c:172)
```
a leak in queued output stream test:
```
72 (40 direct, 32 indirect) bytes in 1 blocks are definitely lost in loss record 219 of 396
at 0x49D51EF: g_type_create_instance (gtype.c:1909)
by 0x49BAC1F: g_object_new_internal (gobject.c:2228)
by 0x49BC247: g_object_new_with_properties (gobject.c:2391)
by 0x49BCFF0: g_object_new (gobject.c:2037)
by 0x402003: test_queued_output_stream_push_bytes_async_error (test_queued_output_stream.c:219)
by 0x4A7DC7D: UnknownInlinedFun (gtestutils.c:2933)
by 0x4A7DC7D: g_test_run_suite_internal (gtestutils.c:3021)
by 0x4A7D9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A7E181: g_test_run_suite (gtestutils.c:3115)
by 0x4A766EC: UnknownInlinedFun (gtestutils.c:2234)
by 0x4A766EC: g_test_run (gtestutils.c:2221)
by 0x402429: main (test_queued_output_stream.c:280)
```
and protocol xfer tests (times 3 for each test that creates a test protocol object):
```
112 (48 direct, 64 indirect) bytes in 1 blocks are definitely lost in loss record 3,430 of 3,698
at 0x49D51EF: g_type_create_instance (gtype.c:1909)
by 0x49BAC1F: g_object_new_internal (gobject.c:2228)
by 0x49BC247: g_object_new_with_properties (gobject.c:2391)
by 0x49BCFF0: g_object_new (gobject.c:2037)
by 0x40291C: test_purple_protocol_xfer_send_file_func (test_protocol_xfer.c:146)
by 0x4A7DC7D: UnknownInlinedFun (gtestutils.c:2933)
by 0x4A7DC7D: g_test_run_suite_internal (gtestutils.c:3021)
by 0x4A7D9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A7E181: g_test_run_suite (gtestutils.c:3115)
by 0x4A766EC: UnknownInlinedFun (gtestutils.c:2234)
by 0x4A766EC: g_test_run (gtestutils.c:2221)
by 0x402B64: main (test_protocol_xfer.c:195)
```
and util tests (times 3 for each call to `purple_text_strip_mnemonic` in the test):
```
5 bytes in 1 blocks are definitely lost in loss record 5 of 247
at 0x484386F: malloc (vg_replace_malloc.c:393)
by 0x49F7168: g_malloc (gmem.c:130)
by 0x491975B: purple_text_strip_mnemonic (util.c:895)
by 0x4015B0: test_util_text_strip_mnemonic (test_util.c:49)
by 0x4A1CC7D: UnknownInlinedFun (gtestutils.c:2933)
by 0x4A1CC7D: g_test_run_suite_internal (gtestutils.c:3021)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1D181: g_test_run_suite (gtestutils.c:3115)
by 0x4A156EC: UnknownInlinedFun (gtestutils.c:2234)
by 0x4A156EC: g_test_run (gtestutils.c:2221)
by 0x401901: main (test_util.c:224)
```
and these leaks in any test that initializes the test UI:
```
4,104 bytes in 1 blocks are possibly lost in loss record 3,451 of 3,457
at 0x484386F: malloc (vg_replace_malloc.c:393)
by 0x5235B67: sqlite3MemMalloc.lto_priv.0 (sqlite3.c:25493)
by 0x5232797: UnknownInlinedFun (sqlite3.c:29181)
by 0x5232797: UnknownInlinedFun (sqlite3.c:29227)
by 0x5232797: sqlite3Malloc.lto_priv.0 (sqlite3.c:29221)
by 0x523BD8B: pcache1Alloc.lto_priv.0 (sqlite3.c:53546)
by 0x5249A8B: UnknownInlinedFun (sqlite3.c:53675)
by 0x5249A8B: allocateTempSpace (sqlite3.c:70848)
by 0x52625A6: sqlite3VdbeExec.lto_priv.0 (sqlite3.c:93857)
by 0x525CBEE: UnknownInlinedFun (sqlite3.c:87995)
by 0x525CBEE: UnknownInlinedFun (sqlite3.c:88056)
by 0x525CBEE: sqlite3_step (sqlite3.c:88045)
by 0x529B324: sqlite3_exec (sqlite3.c:131002)
by 0x48FD558: purple_sqlite3_run_migration (purplesqlite3.c:37)
by 0x48FDBB4: purple_sqlite3_run_migrations_from_resources (purplesqlite3.c:195)
by 0x48FDED9: purple_sqlite_history_adapter_run_migrations (purplesqlitehistoryadapter.c:69)
by 0x48FE7F0: purple_sqlite_history_adapter_activate (purplesqlitehistoryadapter.c:287)
by 0x48DB656: purple_history_adapter_activate (purplehistoryadapter.c:181)
by 0x48DC9BC: purple_history_manager_set_active (purplehistorymanager.c:308)
by 0x402BA8: test_ui_init_history (test_ui.c:132)
by 0x402C80: test_ui_purple_init (test_ui.c:167)
by 0x4027BB: main (test_contact.c:88)
4,368 bytes in 1 blocks are possibly lost in loss record 3,453 of 3,457
at 0x484386F: malloc (vg_replace_malloc.c:393)
by 0x5235B67: sqlite3MemMalloc.lto_priv.0 (sqlite3.c:25493)
by 0x5232797: UnknownInlinedFun (sqlite3.c:29181)
by 0x5232797: UnknownInlinedFun (sqlite3.c:29227)
by 0x5232797: sqlite3Malloc.lto_priv.0 (sqlite3.c:29221)
by 0x523BD8B: pcache1Alloc.lto_priv.0 (sqlite3.c:53546)
by 0x5240077: UnknownInlinedFun (sqlite3.c:53634)
by 0x5240077: pcache1FetchStage2 (sqlite3.c:54104)
by 0x5243E9C: UnknownInlinedFun (sqlite3.c:52671)
by 0x5243E9C: getPageNormal.lto_priv.0 (sqlite3.c:60628)
by 0x524A510: UnknownInlinedFun (sqlite3.c:60805)
by 0x524A510: btreeGetPage.lto_priv.0 (sqlite3.c:70289)
by 0x524C2F6: UnknownInlinedFun (sqlite3.c:71257)
by 0x524C2F6: sqlite3BtreeBeginTrans.lto_priv.0 (sqlite3.c:71647)
by 0x5266B3A: sqlite3VdbeExec.lto_priv.0 (sqlite3.c:93532)
by 0x525CBEE: UnknownInlinedFun (sqlite3.c:87995)
by 0x525CBEE: UnknownInlinedFun (sqlite3.c:88056)
by 0x525CBEE: sqlite3_step (sqlite3.c:88045)
by 0x48FD715: purple_sqlite3_get_schema_version (purplesqlite3.c:79)
by 0x48FD9DD: purple_sqlite3_run_migrations_from_resources (purplesqlite3.c:146)
by 0x48FDED9: purple_sqlite_history_adapter_run_migrations (purplesqlitehistoryadapter.c:69)
by 0x48FE7F0: purple_sqlite_history_adapter_activate (purplesqlitehistoryadapter.c:287)
by 0x48DB656: purple_history_adapter_activate (purplehistoryadapter.c:181)
by 0x48DC9BC: purple_history_manager_set_active (purplehistorymanager.c:308)
by 0x402BA8: test_ui_init_history (test_ui.c:132)
by 0x402C80: test_ui_purple_init (test_ui.c:167)
by 0x4027BB: main (test_contact.c:88)
4,368 bytes in 1 blocks are possibly lost in loss record 3,454 of 3,457
at 0x484386F: malloc (vg_replace_malloc.c:393)
by 0x5235B67: sqlite3MemMalloc.lto_priv.0 (sqlite3.c:25493)
by 0x5232797: UnknownInlinedFun (sqlite3.c:29181)
by 0x5232797: UnknownInlinedFun (sqlite3.c:29227)
by 0x5232797: sqlite3Malloc.lto_priv.0 (sqlite3.c:29221)
by 0x523BD8B: pcache1Alloc.lto_priv.0 (sqlite3.c:53546)
by 0x5240077: UnknownInlinedFun (sqlite3.c:53634)
by 0x5240077: pcache1FetchStage2 (sqlite3.c:54104)
by 0x5243E9C: UnknownInlinedFun (sqlite3.c:52671)
by 0x5243E9C: getPageNormal.lto_priv.0 (sqlite3.c:60628)
by 0x52499BC: UnknownInlinedFun (sqlite3.c:60805)
by 0x52499BC: UnknownInlinedFun (sqlite3.c:70289)
by 0x52499BC: btreeGetUnusedPage (sqlite3.c:70432)
by 0x524F504: allocateBtreePage.lto_priv.0 (sqlite3.c:74604)
by 0x5256209: btreeCreateTable.lto_priv.0 (sqlite3.c:77830)
by 0x5265EB2: UnknownInlinedFun (sqlite3.c:77849)
by 0x5265EB2: sqlite3VdbeExec.lto_priv.0 (sqlite3.c:96382)
by 0x525CBEE: UnknownInlinedFun (sqlite3.c:87995)
by 0x525CBEE: UnknownInlinedFun (sqlite3.c:88056)
by 0x525CBEE: sqlite3_step (sqlite3.c:88045)
by 0x529B324: sqlite3_exec (sqlite3.c:131002)
by 0x48FD558: purple_sqlite3_run_migration (purplesqlite3.c:37)
by 0x48FDBB4: purple_sqlite3_run_migrations_from_resources (purplesqlite3.c:195)
by 0x48FDED9: purple_sqlite_history_adapter_run_migrations (purplesqlitehistoryadapter.c:69)
by 0x48FE7F0: purple_sqlite_history_adapter_activate (purplesqlitehistoryadapter.c:287)
by 0x48DB656: purple_history_adapter_activate (purplehistoryadapter.c:181)
by 0x48DC9BC: purple_history_manager_set_active (purplehistorymanager.c:308)
by 0x402BA8: test_ui_init_history (test_ui.c:132)
by 0x402C80: test_ui_purple_init (test_ui.c:167)
by 0x4027BB: main (test_contact.c:88)
```
Testing Done:
Ran tests in valgrind, and all above leaks were gone except for noted `protocol_xfer` issues, and a bunch of leaks of the `PurpleBuddy`-`PurpleContact` compatibility bindings, which will go away in their entirety eventually.
Reviewed at https://reviews.imfreedom.org/r/2385/
--- a/libpurple/tests/test_account_manager.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_account_manager.c Thu Mar 23 23:11:59 2023 -0500
@@ -218,6 +218,8 @@
*****************************************************************************/
main(gint argc, gchar *argv[]) {
g_test_init(&argc, &argv, NULL);
@@ -231,5 +233,9 @@
g_test_add_func("/account-manager/foreach",
test_purple_account_manager_foreach);
+ test_ui_purple_uninit(); --- a/libpurple/tests/test_account_option.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_account_option.c Thu Mar 23 23:11:59 2023 -0500
@@ -68,6 +68,9 @@
opt2 = purple_account_option_copy(opt1);
test_purple_account_option_compare(opt1, opt2);
+ purple_account_option_destroy(opt1); + purple_account_option_destroy(opt2); @@ -84,6 +87,9 @@
g_assert_cmpint(purple_account_option_get_default_int(opt1),
purple_account_option_get_default_int(opt2));
+ purple_account_option_destroy(opt1); + purple_account_option_destroy(opt2); @@ -94,6 +100,9 @@
opt2 = purple_account_option_copy(opt1);
test_purple_account_option_compare_string(opt1, opt2);
+ purple_account_option_destroy(opt1); + purple_account_option_destroy(opt2); @@ -105,6 +114,9 @@
opt2 = purple_account_option_copy(opt1);
test_purple_account_option_compare_string(opt1, opt2);
+ purple_account_option_destroy(opt1); + purple_account_option_destroy(opt2); @@ -116,6 +128,9 @@
opt2 = purple_account_option_copy(opt1);
test_purple_account_option_compare_string(opt1, opt2);
+ purple_account_option_destroy(opt1); + purple_account_option_destroy(opt2); /******************************************************************************
--- a/libpurple/tests/test_authorization_request.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_authorization_request.c Thu Mar 23 23:11:59 2023 -0500
@@ -302,6 +302,8 @@
*****************************************************************************/
main(gint argc, gchar *argv[]) {
g_test_init(&argc, &argv, NULL);
@@ -325,5 +327,9 @@
g_test_add_func("/request-authorization/deny-message/non-null",
test_purple_authorization_request_deny_message_non_null);
+ test_ui_purple_uninit(); --- a/libpurple/tests/test_contact.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_contact.c Thu Mar 23 23:11:59 2023 -0500
@@ -83,6 +83,8 @@
*****************************************************************************/
main(gint argc, gchar *argv[]) {
g_test_init(&argc, &argv, NULL);
@@ -92,5 +94,9 @@
g_test_add_func("/contact/properties",
test_purple_contact_properties);
+ test_ui_purple_uninit(); --- a/libpurple/tests/test_contact_info.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_contact_info.c Thu Mar 23 23:11:59 2023 -0500
@@ -437,6 +437,8 @@
*****************************************************************************/
main(gint argc, gchar *argv[]) {
g_test_init(&argc, &argv, NULL);
@@ -486,5 +488,9 @@
g_test_add_func("/contact-info/presence-changed-signal",
test_purple_contact_info_presence_changed_signal);
+ test_ui_purple_uninit(); --- a/libpurple/tests/test_contact_manager.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_contact_manager.c Thu Mar 23 23:11:59 2023 -0500
@@ -470,6 +470,8 @@
*****************************************************************************/
main(gint argc, gchar *argv[]) {
g_test_init(&argc, &argv, NULL);
@@ -499,5 +501,9 @@
g_test_add_func("/contact-manager/person/add-via-contact-remove-person-with-contacts",
test_purple_contact_manager_person_add_via_contact_remove_person_with_contacts);
+ test_ui_purple_uninit(); --- a/libpurple/tests/test_conversation.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_conversation.c Thu Mar 23 23:11:59 2023 -0500
@@ -31,6 +31,7 @@
PurpleAccount *account1 = NULL;
PurpleConnectionFlags features = 0;
PurpleConversation *conversation = NULL;
+ PurpleConversationManager *conversation_manager = NULL; GListModel *members = NULL;
@@ -71,6 +72,12 @@
g_assert_cmpstr(title, ==, "title1");
+ /* TODO: Conversations are automatically registered on construction for + * legacy reasons, so we need to explicitly unregister to clean them up, + * but this can go away once that stops happening. */ + conversation_manager = purple_conversation_manager_get_default(); + purple_conversation_manager_unregister(conversation_manager, conversation); /* Free/unref all the things. */
g_clear_object(&account1);
g_clear_object(&members);
@@ -107,6 +114,7 @@
PurpleAccount *account = NULL;
PurpleContactInfo *info = NULL;
PurpleConversation *conversation = NULL;
+ PurpleConversationManager *conversation_manager = NULL; PurpleConversationMember *member = NULL;
PurpleConversationMember *member1 = NULL;
gboolean removed = FALSE;
@@ -164,6 +172,12 @@
g_assert_cmpint(removed_called, ==, 1);
+ /* TODO: Conversations are automatically registered on construction for + * legacy reasons, so we need to explicitly unregister to clean them up, + * but this can go away once that stops happening. */ + conversation_manager = purple_conversation_manager_get_default(); + purple_conversation_manager_unregister(conversation_manager, conversation); /* Clean up everything. */
@@ -176,6 +190,8 @@
*****************************************************************************/
main(gint argc, gchar *argv[]) {
g_test_init(&argc, &argv, NULL);
@@ -186,5 +202,9 @@
g_test_add_func("/conversation/members/add-remove",
test_purple_conversation_members_add_remove);
+ test_ui_purple_uninit(); --- a/libpurple/tests/test_credential_manager.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_credential_manager.c Thu Mar 23 23:11:59 2023 -0500
@@ -311,6 +311,7 @@
password = purple_credential_manager_read_password_finish(manager, res,
g_assert_error(error, PURPLE_CREDENTIAL_MANAGER_DOMAIN, 0);
g_clear_object(&account);
@@ -360,6 +361,7 @@
r = purple_credential_manager_write_password_finish(manager, res, &error);
g_assert_error(error, PURPLE_CREDENTIAL_MANAGER_DOMAIN, 0);
g_clear_object(&account);
@@ -409,6 +411,7 @@
r = purple_credential_manager_clear_password_finish(manager, res, &error);
g_assert_error(error, PURPLE_CREDENTIAL_MANAGER_DOMAIN, 0);
g_clear_object(&account);
@@ -696,5 +699,7 @@
+ test_ui_purple_uninit(); --- a/libpurple/tests/test_credential_provider.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_credential_provider.c Thu Mar 23 23:11:59 2023 -0500
@@ -539,5 +539,7 @@
+ test_ui_purple_uninit(); --- a/libpurple/tests/test_history_adapter.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_history_adapter.c Thu Mar 23 23:11:59 2023 -0500
@@ -236,6 +236,7 @@
test_purple_history_adapter_test_write(void) {
PurpleAccount *account = NULL;
PurpleConversation *conversation = NULL;
+ PurpleConversationManager *conversation_manager = NULL; PurpleHistoryAdapter *adapter = test_purple_history_adapter_new();
PurpleMessage *message = NULL;
TestPurpleHistoryAdapter *ta = TEST_PURPLE_HISTORY_ADAPTER(adapter);
@@ -262,10 +263,14 @@
g_clear_object(&adapter);
g_clear_object(&message);
- /* TODO: something is freeing our ref. */
- /* g_clear_object(&account); */
+ /* TODO: Conversations are automatically registered on construction for + * legacy reasons, so we need to explicitly unregister to clean them up, + * but this can go away once that stops happening. */ + conversation_manager = purple_conversation_manager_get_default(); + purple_conversation_manager_unregister(conversation_manager, conversation); g_clear_object(&conversation);
+ g_clear_object(&account); @@ -274,6 +279,8 @@
*****************************************************************************/
main(gint argc, gchar *argv[]) {
g_test_init(&argc, &argv, NULL);
@@ -291,5 +298,9 @@
g_test_add_func("/history-adapter/write",
test_purple_history_adapter_test_write);
+ test_ui_purple_uninit(); --- a/libpurple/tests/test_history_manager.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_history_manager.c Thu Mar 23 23:11:59 2023 -0500
@@ -315,6 +315,7 @@
test_purple_history_manager_no_adapter_write(void) {
PurpleAccount *account = NULL;
PurpleConversation *conversation = NULL;
+ PurpleConversationManager *conversation_manager = NULL; PurpleHistoryManager *manager = NULL;
PurpleMessage *message = NULL;
@@ -337,11 +338,15 @@
- /* TODO: someone is freeing our ref. */
- /* g_clear_object(&account); */
+ /* TODO: Conversations are automatically registered on construction for + * legacy reasons, so we need to explicitly unregister to clean them up, + * but this can go away once that stops happening. */ + conversation_manager = purple_conversation_manager_get_default(); + purple_conversation_manager_unregister(conversation_manager, conversation); g_clear_object(&message);
g_clear_object(&conversation);
+ g_clear_object(&account); g_clear_object(&manager);
@@ -429,6 +434,7 @@
test_purple_history_manager_adapter_write(void) {
PurpleAccount *account = NULL;
PurpleConversation *conversation = NULL;
+ PurpleConversationManager *conversation_manager = NULL; PurpleHistoryManager *manager = NULL;
PurpleHistoryAdapter *adapter = NULL;
PurpleMessage *message = NULL;
@@ -471,10 +477,14 @@
g_clear_object(&adapter);
g_clear_object(&message);
- /* TODO: something is freeing our ref. */
- /* g_clear_object(&account); */
+ /* TODO: Conversations are automatically registered on construction for + * legacy reasons, so we need to explicitly unregister to clean them up, + * but this can go away once that stops happening. */ + conversation_manager = purple_conversation_manager_get_default(); + purple_conversation_manager_unregister(conversation_manager, conversation); g_clear_object(&conversation);
+ g_clear_object(&account); g_clear_object(&manager);
@@ -515,7 +525,10 @@
test_purple_history_manager_no_adapter_remove);
g_test_add_func("/history-manager/no-adapter/write",
test_purple_history_manager_no_adapter_write);
+ test_ui_purple_uninit(); --- a/libpurple/tests/test_image.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_image.c Thu Mar 23 23:11:59 2023 -0500
@@ -153,6 +153,7 @@
--- a/libpurple/tests/test_notification.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_notification.c Thu Mar 23 23:11:59 2023 -0500
@@ -148,6 +148,8 @@
*****************************************************************************/
main(gint argc, gchar *argv[]) {
g_test_init(&argc, &argv, NULL);
@@ -159,5 +161,9 @@
g_test_add_func("/notification/properties",
test_purple_notification_properties);
+ test_ui_purple_uninit(); --- a/libpurple/tests/test_notification_manager.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_notification_manager.c Thu Mar 23 23:11:59 2023 -0500
@@ -424,5 +424,7 @@
+ test_ui_purple_uninit(); --- a/libpurple/tests/test_person.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_person.c Thu Mar 23 23:11:59 2023 -0500
@@ -494,6 +494,8 @@
*****************************************************************************/
main(gint argc, gchar *argv[]) {
g_test_init(&argc, &argv, NULL);
@@ -532,5 +534,9 @@
g_test_add_func("/person/matches/contact_info",
test_purple_person_matches_contact_info);
+ test_ui_purple_uninit(); --- a/libpurple/tests/test_protocol.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_protocol.c Thu Mar 23 23:11:59 2023 -0500
@@ -242,5 +242,7 @@
+ test_ui_purple_uninit(); --- a/libpurple/tests/test_protocol_xfer.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_protocol_xfer.c Thu Mar 23 23:11:59 2023 -0500
@@ -117,51 +117,71 @@
*****************************************************************************/
test_purple_protocol_xfer_can_receive_func(void) {
- TestPurpleProtocolXfer *xfer = test_purple_protocol_xfer_new();
- PurpleAccount *a = purple_account_new("prpl-xfer-can-receive", "prpl-xfer");
- PurpleConnection *c = g_object_new(PURPLE_TYPE_CONNECTION, "account", a, NULL);
+ TestPurpleProtocolXfer *xfer = NULL; + PurpleAccount *account = NULL; + PurpleConnection *connection = NULL; + xfer = test_purple_protocol_xfer_new(); + account = purple_account_new("prpl-xfer-can-receive", "prpl-xfer"); + connection = g_object_new(PURPLE_TYPE_CONNECTION, "account", account, NULL); g_assert_true(PURPLE_IS_PROTOCOL_XFER(xfer));
- actual = purple_protocol_xfer_can_receive(
- PURPLE_PROTOCOL_XFER(xfer),
+ actual = purple_protocol_xfer_can_receive(PURPLE_PROTOCOL_XFER(xfer), actual = purple_protocol_xfer_can_receive(
PURPLE_PROTOCOL_XFER(xfer),
+ g_clear_object(&account); test_purple_protocol_xfer_send_file_func(void) {
- TestPurpleProtocolXfer *prplxfer = g_object_new(test_purple_protocol_xfer_get_type(), NULL);
- PurpleAccount *a = purple_account_new("prpl-xfer-send", "prpl-xfer");
- PurpleConnection *c = g_object_new(PURPLE_TYPE_CONNECTION, "account", a, NULL);
+ TestPurpleProtocolXfer *prplxfer = NULL; + PurpleAccount *account = NULL; + PurpleConnection *connection = NULL; - purple_protocol_xfer_send_file(PURPLE_PROTOCOL_XFER(prplxfer), c, "foo", "somefile");
+ prplxfer = g_object_new(test_purple_protocol_xfer_get_type(), NULL); + account = purple_account_new("prpl-xfer-send", "prpl-xfer"); + connection = g_object_new(PURPLE_TYPE_CONNECTION, "account", account, NULL); + purple_protocol_xfer_send_file(PURPLE_PROTOCOL_XFER(prplxfer), connection, g_assert_true(prplxfer->send_called);
+ g_clear_object(&account); + g_clear_object(&prplxfer); test_purple_protocol_xfer_new_func(void) {
- TestPurpleProtocolXfer *prplxfer = g_object_new(test_purple_protocol_xfer_get_type(), NULL);
- PurpleAccount *a = purple_account_new("prpl-xfer-new-xfer", "prpl-xfer");
- PurpleConnection *c = g_object_new(PURPLE_TYPE_CONNECTION, "account", a, NULL);
+ TestPurpleProtocolXfer *prplxfer = NULL; + PurpleAccount *account = NULL; + PurpleConnection *connection = NULL; - xfer = purple_protocol_xfer_new_xfer(PURPLE_PROTOCOL_XFER(prplxfer), c, "foo");
+ prplxfer = g_object_new(test_purple_protocol_xfer_get_type(), NULL); + account = purple_account_new("prpl-xfer-new-xfer", "prpl-xfer"); + connection = g_object_new(PURPLE_TYPE_CONNECTION, "account", account, NULL); + xfer = purple_protocol_xfer_new_xfer(PURPLE_PROTOCOL_XFER(prplxfer), g_assert_true(PURPLE_IS_XFER(xfer));
g_assert_cmpstr("foo", ==, purple_xfer_get_remote_user(xfer));
g_assert_true(prplxfer->new_xfer_called);
+ g_clear_object(&account); + g_clear_object(&prplxfer); /******************************************************************************
@@ -194,5 +214,8 @@
+ /* FIXME: We cannot call test_ui_purple_uninit() here because connections + * are not easily destroyed if they haven't been fully implemented. */ --- a/libpurple/tests/test_purplepath.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_purplepath.c Thu Mar 23 23:11:59 2023 -0500
@@ -45,6 +45,8 @@
main(gint argc, gchar **argv) {
g_test_init(&argc, &argv, NULL);
@@ -57,5 +59,10 @@
test_purplepath_config_dir);
g_test_add_func("/purplepath/datadir",
test_purplepath_data_dir);
+ test_ui_purple_uninit(); --- a/libpurple/tests/test_queued_output_stream.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_queued_output_stream.c Thu Mar 23 23:11:59 2023 -0500
@@ -255,6 +255,7 @@
+ g_clear_object(&cancellable); --- a/libpurple/tests/test_ui.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_ui.c Thu Mar 23 23:11:59 2023 -0500
@@ -182,3 +182,8 @@
* the preferences using purple_plugins_save_loaded() */
purple_plugins_load_saved("/purple/test_ui/plugins/saved");
+test_ui_purple_uninit(void) { --- a/libpurple/tests/test_ui.h Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_ui.h Thu Mar 23 23:11:59 2023 -0500
@@ -27,6 +27,7 @@
void test_ui_purple_init(void);
+void test_ui_purple_uninit(void); --- a/libpurple/tests/test_util.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_util.c Thu Mar 23 23:11:59 2023 -0500
@@ -44,10 +44,19 @@
*****************************************************************************/
test_util_text_strip_mnemonic(void) {
- g_assert_cmpstr("", ==, purple_text_strip_mnemonic(""));
- g_assert_cmpstr("foo", ==, purple_text_strip_mnemonic("foo"));
- g_assert_cmpstr("foo", ==, purple_text_strip_mnemonic("_foo"));
+ result = purple_text_strip_mnemonic(""); + g_assert_cmpstr("", ==, result); + result = purple_text_strip_mnemonic("foo"); + g_assert_cmpstr("foo", ==, result); + result = purple_text_strip_mnemonic("_foo"); + g_assert_cmpstr("foo", ==, result); /******************************************************************************
--- a/libpurple/tests/test_whiteboard_manager.c Thu Mar 23 22:49:23 2023 -0500
+++ b/libpurple/tests/test_whiteboard_manager.c Thu Mar 23 23:11:59 2023 -0500
@@ -43,6 +43,8 @@
*****************************************************************************/
main(gint argc, gchar *argv[]) {
g_test_init(&argc, &argv, NULL);
@@ -50,5 +52,9 @@
g_test_add_func("/whiteboard-manager/get-default",
test_purple_whiteboard_manager_get_default);
+ test_ui_purple_uninit();