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

keyfile: another cur at fixing the bridge test

Browse source 
Fixes: 2f82bf537b
(cherry picked from commit c27074bf43)
This commit is contained in:
Lubomir Rintel 2015-01-09 14:37:36 +01:00
parent 5e4155b55c
commit 2f669f659e
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main
View file

@ -3,6 +3,6 @@ ONBOOT=no
TYPE=Bridge
BOOTPROTO=dhcp
STP=on
DELAY=0
DELAY=2
BRIDGING_OPTS="priority=32744 hello_time=7 max_age=39 ageing_time=235352"
MACADDR=00:16:41:11:22:33

2
src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
View file

@ -11212,7 +11212,7 @@ test_read_bridge_main (void)
s_bridge = nm_connection_get_setting_bridge (connection);
g_assert (s_bridge);
g_assert_cmpuint (nm_setting_bridge_get_forward_delay (s_bridge), ==, 0);
g_assert_cmpuint (nm_setting_bridge_get_forward_delay (s_bridge), ==, 2);
g_assert (nm_setting_bridge_get_stp (s_bridge));
g_assert_cmpuint (nm_setting_bridge_get_priority (s_bridge), ==, 32744);
g_assert_cmpuint (nm_setting_bridge_get_hello_time (s_bridge), ==, 7);

2
src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main
View file

@ -6,7 +6,7 @@ type=bridge
[bridge]
interface-name=br0
stp=true
forward-delay=0
forward-delay=2
priority=32744
hello-time=7
max-age=39