test: avoid leaks in leak tests

Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>

2 files changed, 9 insertions, 2 deletions

diff --git a/src/tests/cmocka/test_ifp.c b/src/tests/cmocka/test_ifp.c
index d6e41706d..5793f9191 100644
--- a/src/tests/cmocka/test_ifp.c
+++ b/src/tests/cmocka/test_ifp.c
@@ -209,6 +209,8 @@ void test_el_to_dict(void **state)
     dbus_message_iter_get_basic(&iter_dict, &attr_val);
     assert_string_equal(attr_val, "two");
     assert_false(dbus_message_iter_next(&iter_dict));
+
+    talloc_free(sr);
 }
 
 static void assert_string_list_equal(const char **s1,
@@ -500,7 +502,8 @@ int main(int argc, const char *argv[])
         unit_test(ifp_test_req_create),
         unit_test(ifp_test_req_wrong_uid),
         unit_test(test_path_prefix),
-        unit_test(test_el_to_dict),
+        unit_test_setup_teardown(test_el_to_dict,
+                                 ifp_test_req_setup, ifp_test_req_teardown),
         unit_test(test_attr_acl),
         unit_test(test_attr_acl_ex),
         unit_test(test_attr_allowed),
diff --git a/src/tests/leak_check.c b/src/tests/leak_check.c
index bb5698cd8..1eaa2cd09 100644
--- a/src/tests/leak_check.c
+++ b/src/tests/leak_check.c
@@ -130,10 +130,14 @@ leak_check_setup(void)
 bool
 leak_check_teardown(void)
 {
+    bool res;
     check_leaks_pop(global_talloc_context);
     if (snapshot_stack != NULL) {
         _set_leak_err_msg("Exiting with a non-empty stack");
         return false;
     }
-    return check_leaks(global_talloc_context, 0);
+    res = check_leaks(global_talloc_context, 0);
+    talloc_disable_null_tracking();
+    talloc_free(global_talloc_context);
+    return res;
 }