X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Ftest-catalog.c;h=c605ee0e70963f5c7400cd3622a067310827a545;hb=56e6c2abb8f18bba2bb9d96d66ac7e633349ddfb;hp=b087a8b81cacabb6a658b1ea28de270d753f3d57;hpb=2d5bdf5bc0e4714d42e5999a4e37553a6bf83575;p=elogind.git

diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c
index b087a8b81..c605ee0e7 100644
--- 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);
 }
@@ -62,13 +62,13 @@ static void test_catalog_importing(void) {
         Hashmap *h;
         struct strbuf *sb;
 
-        assert_se(h = hashmap_new(catalog_hash_func, catalog_compare_func));
+        assert_se(h = hashmap_new(&catalog_hash_ops));
         assert_se(sb = strbuf_new());
 
 #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) {
@@ -157,7 +157,8 @@ int main(int argc, char *argv[]) {
 
         setlocale(LC_ALL, "de_DE.UTF-8");
 
-        log_set_max_level(LOG_DEBUG);
+        log_parse_environment();
+        log_open();
 
         test_catalog_file_lang();