diff options
| author | Michael Biebl <biebl@debian.org> | 2026-07-03 19:53:23 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2026-07-03 19:53:23 +0200 |
| commit | aa308069bebf2d5a3200728caa69a76137c03d8b (patch) | |
| tree | c0ba2281e801c4720a0d8a5e5ee943688234f088 /src/core/tests/config | |
| parent | 0a4b2c29da4ccf259bbcea3298d15abebb94348f (diff) | |
| parent | 537bfce2bda471c92caabd388589230200891509 (diff) | |
Update upstream source from tag 'upstream/1.58_rc1'
Update to upstream version '1.58~rc1' with Debian dir 451489c9234e2b6b7c2f41ca6670287ea3ac3efd
Diffstat (limited to 'src/core/tests/config')
| -rw-r--r-- | src/core/tests/config/NetworkManager-warn.conf | 2 | ||||
| -rw-r--r-- | src/core/tests/config/NetworkManager.conf | 2 | ||||
| -rw-r--r-- | src/core/tests/config/test-config.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/tests/config/NetworkManager-warn.conf b/src/core/tests/config/NetworkManager-warn.conf index 80df7c52..f43f4cf1 100644 --- a/src/core/tests/config/NetworkManager-warn.conf +++ b/src/core/tests/config/NetworkManager-warn.conf @@ -1,5 +1,5 @@ [main] -dhcp=dhclient +dhcp=internal plugin=foo,bar,baz no-auto-default=11:11:11:11:11:11 rc-managed=unmanaged diff --git a/src/core/tests/config/NetworkManager.conf b/src/core/tests/config/NetworkManager.conf index ae9f3e46..7584a0f2 100644 --- a/src/core/tests/config/NetworkManager.conf +++ b/src/core/tests/config/NetworkManager.conf @@ -1,5 +1,5 @@ [main] -dhcp=dhclient +dhcp=internal plugins=foo,bar,baz no-auto-default=11:11:11:11:11:11 diff --git a/src/core/tests/config/test-config.c b/src/core/tests/config/test-config.c index b2f29821..c549bcaa 100644 --- a/src/core/tests/config/test-config.c +++ b/src/core/tests/config/test-config.c @@ -162,7 +162,7 @@ test_config_simple(void) g_assert_cmpstr(nm_config_data_get_config_main_file(nm_config_get_data_orig(config)), ==, TEST_DIR "/NetworkManager.conf"); - g_assert_cmpstr(_config_get_dhcp_client_a(config), ==, "dhclient"); + g_assert_cmpstr(_config_get_dhcp_client_a(config), ==, "internal"); g_assert_cmpstr(nm_config_get_log_level(config), ==, "INFO"); g_assert_cmpint(nm_config_data_get_connectivity_interval(nm_config_get_data_orig(config)), ==, @@ -297,7 +297,7 @@ test_config_override(void) g_assert_cmpstr(nm_config_data_get_config_main_file(nm_config_get_data_orig(config)), ==, TEST_DIR "/NetworkManager.conf"); - g_assert_cmpstr(_config_get_dhcp_client_a(config), ==, "dhclient"); + g_assert_cmpstr(_config_get_dhcp_client_a(config), ==, "internal"); g_assert_cmpstr(nm_config_get_log_level(config), ==, "INFO"); g_assert_cmpint(nm_config_data_get_connectivity_interval(nm_config_get_data_orig(config)), ==, |