diff options
| author | Michael Biebl <biebl@debian.org> | 2024-02-13 22:24:20 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-02-13 22:24:20 +0100 |
| commit | 4e0c152343821d62f79db8f047395cabc3005b8e (patch) | |
| tree | 31f8fbf3be8013dc34844ac720eb71dabbf04075 /src/libnm-core-impl/tests/test-setting.c | |
| parent | 0260b90a50f9c49eb216249afea08ba3f3b8981f (diff) | |
| parent | 6681f77b757bbc42ce5c8868ee9142b7ebc8c059 (diff) | |
Update upstream source from tag 'upstream/1.45.91'
Update to upstream version '1.45.91' with Debian dir bebf00e416cd984203cf3c98296e0b1f3016c889
Diffstat (limited to 'src/libnm-core-impl/tests/test-setting.c')
| -rw-r--r-- | src/libnm-core-impl/tests/test-setting.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/libnm-core-impl/tests/test-setting.c b/src/libnm-core-impl/tests/test-setting.c index 4b1aa2c1..72b855a5 100644 --- a/src/libnm-core-impl/tests/test-setting.c +++ b/src/libnm-core-impl/tests/test-setting.c @@ -4664,10 +4664,7 @@ test_setting_metadata(void) } else if (sip->property_type->direct_type == NM_VALUE_TYPE_ENUM) { const GParamSpecEnum *pspec; - g_assert(sip->property_type == &nm_sett_info_propert_type_direct_enum); g_assert(g_variant_type_equal(sip->property_type->dbus_type, "i")); - g_assert(sip->property_type->to_dbus_fcn - == _nm_setting_property_to_dbus_fcn_direct); g_assert(sip->param_spec); g_assert(g_type_is_a(sip->param_spec->value_type, G_TYPE_ENUM)); g_assert(sip->param_spec->value_type != G_TYPE_ENUM); @@ -4706,10 +4703,6 @@ test_setting_metadata(void) INFINIBAND_ALEN)); } else { g_assert(g_variant_type_equal(sip->property_type->dbus_type, "s")); - g_assert(NM_IN_SET(sip->property_type->to_dbus_fcn, - _nm_setting_property_to_dbus_fcn_direct, - _nm_setting_connection_controller_to_dbus, - _nm_setting_connection_port_type_to_dbus)); can_have_direct_set_fcn = TRUE; } g_assert(sip->param_spec); @@ -4847,18 +4840,6 @@ check_done:; if (sip->property_type->from_dbus_fcn == _nm_setting_property_from_dbus_fcn_gprop) g_assert(sip->param_spec); - if (sip->property_type->from_dbus_fcn) { - if (sip->property_type->direct_type != NM_VALUE_TYPE_NONE) { - g_assert(NM_IN_SET(sip->property_type->from_dbus_fcn, - _nm_setting_property_from_dbus_fcn_direct_ip_config_gateway, - _nm_setting_property_from_dbus_fcn_direct_mac_address, - _nm_setting_connection_controller_from_dbus, - _nm_setting_connection_master_from_dbus, - _nm_setting_connection_slave_type_from_dbus, - _nm_setting_connection_port_type_from_dbus, - _nm_setting_property_from_dbus_fcn_direct)); - } - } g_assert(sip->property_type->from_dbus_is_full == NM_IN_SET(sip->property_type->from_dbus_fcn, @@ -4875,11 +4856,6 @@ check_done:; } else if (sip->property_type->compare_fcn == _nm_setting_property_compare_fcn_direct) { g_assert(sip->param_spec); g_assert(sip->property_type->direct_type != NM_VALUE_TYPE_NONE); - g_assert(NM_IN_SET(sip->property_type->to_dbus_fcn, - _nm_setting_property_to_dbus_fcn_direct, - _nm_setting_property_to_dbus_fcn_direct_mac_address, - _nm_setting_connection_controller_to_dbus, - _nm_setting_connection_port_type_to_dbus)); } else if (sip->property_type->compare_fcn == _nm_setting_property_compare_fcn_ignore) { if (NM_IN_SET(sip->property_type, &nm_sett_info_propert_type_deprecated_ignore_i, |