fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-29 01:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

keyfile/tests: extend test for parsing routes/addresses

Browse source 
Keyfile supports both route*/address* and routes*/addresses*
fields at the same time. Extend the tests, that they are read
all as expected.
This commit is contained in:
Thomas Haller 2018-04-13 14:07:33 +02:00
parent 8f967d0281
commit 8d93017b16
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection
View file

@ -26,15 +26,21 @@ routes1=1.2.3.0/24,2.3.4.8,99
route=5.6.7.8/32
routes2=1.1.1.2/12,
routes3=1.1.1.3/13,,
routes7=1.1.1.7/17,0.0.0.0
routes4=1.1.1.4/14,2.2.2.4
address30=1.2.3.130/24
routes5=1.1.1.5/15,2.2.2.5,
routes6=1.1.1.6/16,2.2.2.6,0
routes7=1.1.1.7/17,0.0.0.0
routes8=1.1.1.8/18,0.0.0.0,
routes9=1.1.1.9/19,0.0.0.0,0
route10=1.1.1.10/21,,0
routes10=1.1.1.10/20,,0
routes11=1.1.1.11/21,,21
routes11_options=cwnd=10,lock-cwnd=true,mtu=1430,src=7.7.7.7
address30=1.2.3.30/24
addresses30=1.2.3.30/25
addresses31=1.2.3.31/25
address31=1.2.3.31/24
ignore-auto-routes=false
ignore-auto-dns=false

15
src/settings/plugins/keyfile/tests/test-keyfile.c
View file

@ -280,19 +280,23 @@ test_read_valid_wired_connection (void)
g_assert_cmpstr (nm_setting_ip_config_get_dns (s_ip4, 1), ==, "4.2.2.2");
/* IPv4 addresses */
g_assert_cmpint (nm_setting_ip_config_get_num_addresses (s_ip4), ==, 6);
g_assert_cmpint (nm_setting_ip_config_get_num_addresses (s_ip4), ==, 10);
check_ip_address (s_ip4, 0, "2.3.4.5", 24);
check_ip_address (s_ip4, 1, "192.168.0.5", 24);
check_ip_address (s_ip4, 2, "1.2.3.4", 16);
check_ip_address (s_ip4, 3, "3.4.5.6", 16);
check_ip_address (s_ip4, 4, "4.5.6.7", 24);
check_ip_address (s_ip4, 5, "5.6.7.8", 24);
check_ip_address (s_ip4, 6, "1.2.3.30", 24);
check_ip_address (s_ip4, 7, "1.2.3.30", 25);
check_ip_address (s_ip4, 8, "1.2.3.31", 24);
check_ip_address (s_ip4, 9, "1.2.3.31", 25);
/* IPv4 gateway */
g_assert_cmpstr (nm_setting_ip_config_get_gateway (s_ip4), ==, "2.3.4.6");
/* IPv4 routes */
g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip4), ==, 12);
g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip4), ==, 13);
check_ip_route (s_ip4, 0, "5.6.7.8", 32, NULL, -1);
check_ip_route (s_ip4, 1, "1.2.3.0", 24, "2.3.4.8", 99);
check_ip_route (s_ip4, 2, "1.1.1.2", 12, NULL, -1);
@ -303,11 +307,12 @@ test_read_valid_wired_connection (void)
check_ip_route (s_ip4, 7, "1.1.1.7", 17, NULL, -1);
check_ip_route (s_ip4, 8, "1.1.1.8", 18, NULL, -1);
check_ip_route (s_ip4, 9, "1.1.1.9", 19, NULL, 0);
check_ip_route (s_ip4, 10, "1.1.1.10", 20, NULL, 0);
check_ip_route (s_ip4, 11, "1.1.1.11", 21, NULL, 21);
check_ip_route (s_ip4, 10, "1.1.1.10", 21, NULL, 0);
check_ip_route (s_ip4, 11, "1.1.1.10", 20, NULL, 0);
check_ip_route (s_ip4, 12, "1.1.1.11", 21, NULL, 21);
/* Route attributes */
route = nm_setting_ip_config_get_route (s_ip4, 11);
route = nm_setting_ip_config_get_route (s_ip4, 12);
g_assert (route);
nmtst_assert_route_attribute_uint32 (route, NM_IP_ROUTE_ATTRIBUTE_CWND, 10);