[Libosinfo] [PATCH] Enhance test-isodetect: continue after failure

Věra Cholasta vbudikov at redhat.com
Mon Oct 15 17:43:59 UTC 2018


---
 tests/test-isodetect.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
index 76f0c5a..f40f5cc 100644
--- a/tests/test-isodetect.c
+++ b/tests/test-isodetect.c
@@ -390,17 +390,16 @@ static void test_one(const gchar *vendor)
 
     g_assert_nonnull(isos);
 
-    tmp = isos;
-    while (tmp) {
+    for (tmp = isos; tmp; tmp = tmp->next) {
         struct ISOInfo *info  = tmp->data;
         gboolean matched = osinfo_db_identify_media(db, info->media);
         OsinfoOs *os;
 
         g_test_message("checking OS %s for ISO %s",
                        info->shortid, info->filename);
+        g_assert_true(matched);
         if (!matched) {
-            g_error("ISO %s was not matched by OS %s",
-                    info->filename, info->shortid);
+            continue;
         }
 
         g_object_get(info->media, "os", &os, NULL);
@@ -408,8 +407,6 @@ static void test_one(const gchar *vendor)
         g_assert_cmpstr(shortid, ==, info->shortid);
         g_object_unref(G_OBJECT(os));
         test_langs(info);
-
-        tmp = tmp->next;
     }
 
     g_list_foreach(isos, (GFunc)free_iso, NULL);
@@ -422,6 +419,7 @@ int
 main(int argc, char *argv[])
 {
     g_test_init(&argc, &argv, NULL);
+    g_test_set_nonfatal_assertions();
 
     GList *vendors = load_vendors(NULL);
     GList *it;
-- 
1.8.3.1




More information about the Libosinfo mailing list