summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2016-04-13 15:17:52 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2016-06-03 22:19:38 +0200
commitb5efd22c14d127de330f5e20ec7740256dd25afa (patch)
tree701fffc0c369135c405d4a3f827bccdb2ba04d86
parent963b72bccbd9ae85cc272d0271c43251266112b9 (diff)
downloadNetworkManager-b5efd22c14d127de330f5e20ec7740256dd25afa.tar.gz
ifupdown/tests: fix memory leaks
Fix memory leaks in tests for the ifupdown plugin and re-enable valgrind.
-rw-r--r--src/settings/plugins/ifupdown/tests/Makefile.am3
-rw-r--r--src/settings/plugins/ifupdown/tests/test-ifupdown.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/settings/plugins/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am
index e12c01813b..4f01fc0c9b 100644
--- a/src/settings/plugins/ifupdown/tests/Makefile.am
+++ b/src/settings/plugins/ifupdown/tests/Makefile.am
@@ -23,8 +23,7 @@ test_ifupdown_SOURCES = \
test_ifupdown_LDADD = \
$(top_builddir)/src/libNetworkManager.la
-# TODO: enable valgrind for ifupdown. Currently it fails.
-#@VALGRIND_RULES@
+@VALGRIND_RULES@
TESTS = test-ifupdown
endif
diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
index ad483fa856..7ce08aee24 100644
--- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c
+++ b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
@@ -506,6 +506,7 @@ test17_read_static_ipv4 (const char *path)
g_assert_cmpstr (nm_setting_ip_config_get_dns_search (s_ip4, 0), ==, "example.com");
g_assert_cmpstr (nm_setting_ip_config_get_dns_search (s_ip4, 1), ==, "foo.example.com");
+ ifparser_destroy ();
g_object_unref (connection);
}
@@ -560,6 +561,7 @@ test18_read_static_ipv6 (const char *path)
g_assert_cmpstr (nm_setting_ip_config_get_dns_search (s_ip6, 0), ==, "example.com");
g_assert_cmpstr (nm_setting_ip_config_get_dns_search (s_ip6, 1), ==, "foo.example.com");
+ ifparser_destroy ();
g_object_unref (connection);
}
@@ -594,6 +596,7 @@ test19_read_static_ipv4_plen (const char *path)
g_assert_cmpstr (nm_ip_address_get_address (ip4_addr), ==, "10.0.0.3");
g_assert_cmpint (nm_ip_address_get_prefix (ip4_addr), ==, 8);
+ ifparser_destroy ();
g_object_unref (connection);
}