diff options
Diffstat (limited to 'src/settings/plugins/keyfile/tests/test-keyfile.c')
| -rw-r--r-- | src/settings/plugins/keyfile/tests/test-keyfile.c | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c index f14e5cf7..2f89c5f1 100644 --- a/src/settings/plugins/keyfile/tests/test-keyfile.c +++ b/src/settings/plugins/keyfile/tests/test-keyfile.c @@ -1193,11 +1193,8 @@ test_read_string_ssid (void) TEST_STRING_SSID_FILE, NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_SSID); - ASSERT (memcmp (array->data, expected_ssid, sizeof (expected_ssid)) == 0, - "connection-verify-wireless", "failed to verify %s: unexpected %s / %s key value", - TEST_STRING_SSID_FILE, - NM_SETTING_WIRELESS_SETTING_NAME, - NM_SETTING_WIRELESS_SSID); + g_assert_cmpint (array->len, ==, strlen (expected_ssid)); + g_assert (memcmp (array->data, expected_ssid, array->len) == 0); g_object_unref (connection); } @@ -3078,6 +3075,28 @@ test_write_bridge_component (void) g_object_unref (connection); } +static void +test_read_missing_vlan_setting (void) +{ + NMConnection *connection; + NMSettingVlan *s_vlan; + GError *error = NULL; + gboolean success; + + connection = nm_keyfile_plugin_connection_from_file (TEST_KEYFILES_DIR"/Test_Missing_Vlan_Setting", &error); + g_assert_no_error (error); + g_assert (connection); + success = nm_connection_verify (connection, &error); + g_assert_no_error (error); + g_assert (success); + + /* Ensure the VLAN setting exists */ + s_vlan = nm_connection_get_setting_vlan (connection); + g_assert (s_vlan); + g_assert_cmpint (nm_setting_vlan_get_id (s_vlan), ==, 0); + + g_object_unref (connection); +} int main (int argc, char **argv) { @@ -3135,6 +3154,8 @@ int main (int argc, char **argv) test_read_bridge_component (); test_write_bridge_component (); + test_read_missing_vlan_setting (); + base = g_path_get_basename (argv[0]); fprintf (stdout, "%s: SUCCESS\n", base); g_free (base); |