core: make testcases work after bonding merge

This commit is contained in:
Dan Williams 2011-11-09 23:40:04 -06:00
parent 3ef7bca6fa
commit c15dea298f
2 changed files with 10 additions and 8 deletions

View file

@ -170,15 +170,15 @@ global:
nm_setting_bluetooth_new;
nm_setting_bond_error_get_type;
nm_setting_bond_error_quark;
nm_setting_bond_new;
nm_setting_bond_get_type;
nm_setting_bond_get_interface_name;
nm_setting_bond_get_mode;
nm_setting_bond_get_miimon;
nm_setting_bond_get_downdelay;
nm_setting_bond_get_updelay;
nm_setting_bond_get_arp_interval;
nm_setting_bond_get_arp_ip_target;
nm_setting_bond_get_downdelay;
nm_setting_bond_get_interface_name;
nm_setting_bond_get_miimon;
nm_setting_bond_get_mode;
nm_setting_bond_get_type;
nm_setting_bond_get_updelay;
nm_setting_bond_new;
nm_setting_cdma_error_get_type;
nm_setting_cdma_error_quark;
nm_setting_cdma_get_number;
@ -196,8 +196,8 @@ global:
nm_setting_connection_get_autoconnect;
nm_setting_connection_get_connection_type;
nm_setting_connection_get_id;
nm_setting_connection_get_num_permissions;
nm_setting_connection_get_master;
nm_setting_connection_get_num_permissions;
nm_setting_connection_get_permission;
nm_setting_connection_get_read_only;
nm_setting_connection_get_slave_type;

View file

@ -850,6 +850,8 @@ test_connection_diff_a_only (void)
{ NM_SETTING_CONNECTION_READ_ONLY, NM_SETTING_DIFF_RESULT_IN_A },
{ NM_SETTING_CONNECTION_PERMISSIONS, NM_SETTING_DIFF_RESULT_IN_A },
{ NM_SETTING_CONNECTION_ZONE, NM_SETTING_DIFF_RESULT_IN_A },
{ NM_SETTING_CONNECTION_MASTER, NM_SETTING_DIFF_RESULT_IN_A },
{ NM_SETTING_CONNECTION_SLAVE_TYPE, NM_SETTING_DIFF_RESULT_IN_A },
{ NULL, NM_SETTING_DIFF_RESULT_UNKNOWN }
} },
{ NM_SETTING_WIRED_SETTING_NAME, {