summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam@afuera.me.uk>2019-08-23 08:24:59 +0000
committerSam Thursfield <sam@afuera.me.uk>2019-08-23 08:24:59 +0000
commitb49081beb475334cc36babb15927b0cb3087d210 (patch)
treecf5455d6a070a6292dc112c53d86c23bdebf3d90
parent72ebd743709d1a1c4e1f5c706d031b21b2654280 (diff)
parent939771b5f6c3b3cf3168a913f0f275e9e58ccc04 (diff)
downloadtracker-b49081beb475334cc36babb15927b0cb3087d210.tar.gz
Merge branch 'zerosize-mimetype-support' into 'master'
file-utils-test: application/x-zerosize is a valid mime for an empty file See merge request GNOME/tracker!118
-rw-r--r--tests/libtracker-common/tracker-file-utils-test.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/libtracker-common/tracker-file-utils-test.c b/tests/libtracker-common/tracker-file-utils-test.c
index 66f9739fa..a41bead43 100644
--- a/tests/libtracker-common/tracker-file-utils-test.c
+++ b/tests/libtracker-common/tracker-file-utils-test.c
@@ -235,7 +235,8 @@ test_file_get_mime_type (void)
f = g_file_new_for_path (TEST_FILENAME);
result = tracker_file_get_mime_type (f);
- g_assert_cmpstr (result, ==, "text/plain");
+ g_assert_true (g_strcmp0 (result, "text/plain") == 0 ||
+ g_strcmp0 (result, "application/x-zerosize") == 0);
g_object_unref (f);
g_free (result);