From 90e8691111889a7b5f3c812f5a41f15a8a058913 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 7 Nov 2017 00:14:39 +0100 Subject: New upstream version 1.9.90 --- src/tests/config/test-config.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'src/tests/config') diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c index edb5c1aa..80e17d01 100644 --- a/src/tests/config/test-config.c +++ b/src/tests/config/test-config.c @@ -26,6 +26,7 @@ #include "nm-test-device.h" #include "platform/nm-fake-platform.h" #include "nm-bus-manager.h" +#include "nm-connectivity.h" #include "nm-test-utils-core.h" @@ -317,6 +318,40 @@ test_config_global_dns (void) g_object_unref (config); } +static void +test_config_connectivity_check (void) +{ + const char *CONFIG_INTERN = BUILDDIR"/test-connectivity-check-intern.conf"; + NMConfig *config; + NMConnectivity *connectivity; + + g_assert (g_file_set_contents (CONFIG_INTERN, "", 0, NULL)); + config = setup_config (NULL, SRCDIR "/NetworkManager.conf", CONFIG_INTERN, NULL, + "/no/such/dir", "", NULL); + connectivity = nm_connectivity_get(); + + g_assert (nm_connectivity_check_enabled (connectivity)); + + /* disable connectivity checking */ + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*config: signal *"); + nm_config_set_connectivity_check_enabled (config, FALSE); + g_test_assert_expected_messages (); + + g_assert (!nm_connectivity_check_enabled (connectivity)); + + /* re-enable connectivity checking */ + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*config: signal *"); + nm_config_set_connectivity_check_enabled (config, TRUE); + g_test_assert_expected_messages (); + + g_assert (nm_connectivity_check_enabled (connectivity)); + + g_object_unref (connectivity); + g_object_unref (config); + + g_assert (remove (CONFIG_INTERN) == 0); +} + static void test_config_no_auto_default (void) { @@ -1018,6 +1053,7 @@ main (int argc, char **argv) g_test_add_func ("/config/set-values", test_config_set_values); g_test_add_func ("/config/global-dns", test_config_global_dns); + g_test_add_func ("/config/connectivity-check", test_config_connectivity_check); g_test_add_func ("/config/signal", test_config_signal); -- cgit 1.3.0-6-gf8a5