From c15dea298f1c759ce17051fb7c376397965766b5 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 9 Nov 2011 23:40:04 -0600 Subject: [PATCH] core: make testcases work after bonding merge --- libnm-util/libnm-util.ver | 16 ++++++++-------- libnm-util/tests/test-general.c | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/libnm-util/libnm-util.ver b/libnm-util/libnm-util.ver index 415c19b3d4..6a7bc098df 100644 --- a/libnm-util/libnm-util.ver +++ b/libnm-util/libnm-util.ver @@ -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; diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c index 1b509f25e7..10cda51a31 100644 --- a/libnm-util/tests/test-general.c +++ b/libnm-util/tests/test-general.c @@ -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, {