ubports-cn/ofono
1
0
Fork 0
forked from sailfishos/ofono
Code Issues Pull Requests Projects Releases Wiki Activity

[ofono] Don't care about whitespace in config unit test. JB#61330

Browse Source 
New glib keeps some extra line feed on the merged conf file data.
It shouldn't really matter so ignore such differences on the test.
This commit is contained in:
Pekka Vuorela
2024-02-19 15:47:47 +02:00
parent a50522b062
commit cff7c7adb1
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ofono/unit/test-conf.c
View File

@@ -75,6 +75,7 @@ static void test_merge1(const char *conf, const char *conf1, const char *out)
char *file1 = g_strconcat(subdir, "/bar.conf", NULL); char *file1 = g_strconcat(subdir, "/bar.conf", NULL);
GKeyFile *k = g_key_file_new(); GKeyFile *k = g_key_file_new();
char *data; char *data;
char *out_stripped = g_strstrip(g_strdup(out));
g_assert(!mkdir(subdir, 0700)); g_assert(!mkdir(subdir, 0700));
g_assert(g_file_set_contents(file, conf, -1, NULL)); g_assert(g_file_set_contents(file, conf, -1, NULL));
@@ -84,8 +85,9 @@ static void test_merge1(const char *conf, const char *conf1, const char *out)
g_key_file_set_list_separator(k, ','); g_key_file_set_list_separator(k, ',');
ofono_conf_merge_files(k, file); ofono_conf_merge_files(k, file);
data = g_key_file_to_data(k, NULL, NULL); data = g_key_file_to_data(k, NULL, NULL);
g_strstrip(data);
DBG("\n%s", data); DBG("\n%s", data);
g_assert(!g_strcmp0(data, out)); g_assert(!g_strcmp0(data, out_stripped));
g_free(data); g_free(data);
g_key_file_unref(k); g_key_file_unref(k);
@@ -94,6 +96,7 @@ static void test_merge1(const char *conf, const char *conf1, const char *out)
remove(subdir); remove(subdir);
remove(dir); remove(dir);
g_free(out_stripped);
g_free(file); g_free(file);
g_free(file1); g_free(file1);
g_free(dir); g_free(dir);