util: when using basename() for creating temporary files, verify the resulting name...

[elogind.git] / src / journal / test-catalog.c

diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c
index 5fe2f6a2697e6bb65ba264b2c274e297a013293a..c605ee0e70963f5c7400cd3622a067310827a545 100644 (file)
--- a/src/journal/test-catalog.c
+++ b/src/journal/test-catalog.c
@@ -49,11 +49,11 @@ static void test_import(Hashmap *h, struct strbuf *sb,
         _cleanup_close_ int fd;
 
         fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
-        assert(fd >= 0);
+        assert_se(fd >= 0);
         assert_se(write(fd, contents, size) == size);
 
         r = catalog_import_file(h, sb, name);
-        assert(r == code);
+        assert_se(r == code);
 
         unlink(name);
 }
@@ -68,7 +68,7 @@ static void test_catalog_importing(void) {
 #define BUF "xxx"
         test_import(h, sb, BUF, sizeof(BUF), -EINVAL);
 #undef BUF
-        assert(hashmap_isempty(h));
+        assert_se(hashmap_isempty(h));
         log_debug("----------------------------------------");
 
 #define BUF \
@@ -89,7 +89,7 @@ static void test_catalog_importing(void) {
         test_import(h, sb, BUF, sizeof(BUF), 0);
 #undef BUF
 
-        assert(hashmap_size(h) == 1);
+        assert_se(hashmap_size(h) == 1);
 
         log_debug("----------------------------------------");
 
@@ -105,22 +105,22 @@ static void test_catalog_update(void) {
         int r;
 
         r = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
-        assert(r >= 0);
+        assert_se(r >= 0);
 
         database = name;
 
         /* Test what happens if there are no files. */
         r = catalog_update(database, NULL, NULL);
-        assert(r >= 0);
+        assert_se(r >= 0);
 
         /* Test what happens if there are no files in the directory. */
         r = catalog_update(database, NULL, no_catalog_dirs);
-        assert(r >= 0);
+        assert_se(r >= 0);
 
         /* Make sure that we at least have some files loaded or the
            catalog_list below will fail. */
         r = catalog_update(database, NULL, catalog_dirs);
-        assert(r >= 0);
+        assert_se(r >= 0);
 }
 
 static void test_catalog_file_lang(void) {