X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Ftest-journal.c;h=29d5877986dd065dce5a25ec8b5bd83e91f25476;hp=05bb2ea8ed8b4d61eb08010492b5ca2c82761eb0;hb=14499361a537f769fadfb2e9323c8a65d31e6862;hpb=0284adc6a60ce0af1107cb0b50041a65d731f39e diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c index 05bb2ea8e..29d587798 100644 --- a/src/journal/test-journal.c +++ b/src/journal/test-journal.c @@ -22,18 +22,20 @@ #include #include -#include +#include "systemd/sd-journal.h" #include "log.h" #include "journal-file.h" #include "journal-authenticate.h" #include "journal-vacuum.h" -int main(int argc, char *argv[]) { +static bool arg_keep = false; + +static void test_non_empty(void) { dual_timestamp ts; JournalFile *f; struct iovec iovec; - static const char test[] = "test", test2[] = "test2"; + static const char test[] = "TEST1=1", test2[] = "TEST2=2"; Object *o; uint64_t p; char t[] = "/tmp/journal-XXXXXX"; @@ -59,69 +61,121 @@ int main(int argc, char *argv[]) { iovec.iov_len = strlen(test); assert_se(journal_file_append_entry(f, &ts, &iovec, 1, NULL, NULL, NULL) == 0); +#ifdef HAVE_GCRYPT journal_file_append_tag(f); +#endif journal_file_dump(f); - assert(journal_file_next_entry(f, NULL, 0, DIRECTION_DOWN, &o, &p) == 1); - assert(le64toh(o->entry.seqnum) == 1); - - assert(journal_file_next_entry(f, o, p, DIRECTION_DOWN, &o, &p) == 1); - assert(le64toh(o->entry.seqnum) == 2); - - assert(journal_file_next_entry(f, o, p, DIRECTION_DOWN, &o, &p) == 1); - assert(le64toh(o->entry.seqnum) == 3); + assert_se(journal_file_next_entry(f, NULL, 0, DIRECTION_DOWN, &o, &p) == 1); + assert_se(le64toh(o->entry.seqnum) == 1); - assert(journal_file_next_entry(f, o, p, DIRECTION_DOWN, &o, &p) == 0); + assert_se(journal_file_next_entry(f, o, p, DIRECTION_DOWN, &o, &p) == 1); + assert_se(le64toh(o->entry.seqnum) == 2); - assert(journal_file_next_entry(f, NULL, 0, DIRECTION_DOWN, &o, &p) == 1); - assert(le64toh(o->entry.seqnum) == 1); + assert_se(journal_file_next_entry(f, o, p, DIRECTION_DOWN, &o, &p) == 1); + assert_se(le64toh(o->entry.seqnum) == 3); - assert(journal_file_skip_entry(f, o, p, 2, &o, &p) == 1); - assert(le64toh(o->entry.seqnum) == 3); + assert_se(journal_file_next_entry(f, o, p, DIRECTION_DOWN, &o, &p) == 0); - assert(journal_file_skip_entry(f, o, p, -2, &o, &p) == 1); - assert(le64toh(o->entry.seqnum) == 1); + assert_se(journal_file_next_entry(f, NULL, 0, DIRECTION_DOWN, &o, &p) == 1); + assert_se(le64toh(o->entry.seqnum) == 1); - assert(journal_file_skip_entry(f, o, p, -2, &o, &p) == 1); - assert(le64toh(o->entry.seqnum) == 1); + assert_se(journal_file_find_data_object(f, test, strlen(test), NULL, &p) == 1); + assert_se(journal_file_next_entry_for_data(f, NULL, 0, p, DIRECTION_DOWN, &o, NULL) == 1); + assert_se(le64toh(o->entry.seqnum) == 1); - assert(journal_file_find_data_object(f, test, strlen(test), NULL, &p) == 1); - assert(journal_file_next_entry_for_data(f, NULL, 0, p, DIRECTION_DOWN, &o, NULL) == 1); - assert(le64toh(o->entry.seqnum) == 1); + assert_se(journal_file_next_entry_for_data(f, NULL, 0, p, DIRECTION_UP, &o, NULL) == 1); + assert_se(le64toh(o->entry.seqnum) == 3); - assert(journal_file_next_entry_for_data(f, NULL, 0, p, DIRECTION_UP, &o, NULL) == 1); - assert(le64toh(o->entry.seqnum) == 3); + assert_se(journal_file_find_data_object(f, test2, strlen(test2), NULL, &p) == 1); + assert_se(journal_file_next_entry_for_data(f, NULL, 0, p, DIRECTION_UP, &o, NULL) == 1); + assert_se(le64toh(o->entry.seqnum) == 2); - assert(journal_file_find_data_object(f, test2, strlen(test2), NULL, &p) == 1); - assert(journal_file_next_entry_for_data(f, NULL, 0, p, DIRECTION_UP, &o, NULL) == 1); - assert(le64toh(o->entry.seqnum) == 2); + assert_se(journal_file_next_entry_for_data(f, NULL, 0, p, DIRECTION_DOWN, &o, NULL) == 1); + assert_se(le64toh(o->entry.seqnum) == 2); - assert(journal_file_next_entry_for_data(f, NULL, 0, p, DIRECTION_DOWN, &o, NULL) == 1); - assert(le64toh(o->entry.seqnum) == 2); + assert_se(journal_file_find_data_object(f, "quux", 4, NULL, &p) == 0); - assert(journal_file_find_data_object(f, "quux", 4, NULL, &p) == 0); + assert_se(journal_file_move_to_entry_by_seqnum(f, 1, DIRECTION_DOWN, &o, NULL) == 1); + assert_se(le64toh(o->entry.seqnum) == 1); - assert(journal_file_move_to_entry_by_seqnum(f, 1, DIRECTION_DOWN, &o, NULL) == 1); - assert(le64toh(o->entry.seqnum) == 1); + assert_se(journal_file_move_to_entry_by_seqnum(f, 3, DIRECTION_DOWN, &o, NULL) == 1); + assert_se(le64toh(o->entry.seqnum) == 3); - assert(journal_file_move_to_entry_by_seqnum(f, 3, DIRECTION_DOWN, &o, NULL) == 1); - assert(le64toh(o->entry.seqnum) == 3); + assert_se(journal_file_move_to_entry_by_seqnum(f, 2, DIRECTION_DOWN, &o, NULL) == 1); + assert_se(le64toh(o->entry.seqnum) == 2); - assert(journal_file_move_to_entry_by_seqnum(f, 2, DIRECTION_DOWN, &o, NULL) == 1); - assert(le64toh(o->entry.seqnum) == 2); - - assert(journal_file_move_to_entry_by_seqnum(f, 10, DIRECTION_DOWN, &o, NULL) == 0); + assert_se(journal_file_move_to_entry_by_seqnum(f, 10, DIRECTION_DOWN, &o, NULL) == 0); journal_file_rotate(&f, true, true); journal_file_rotate(&f, true, true); journal_file_close(f); - journal_directory_vacuum(".", 3000000, 0); + log_info("Done..."); + + if (arg_keep) + log_info("Not removing %s", t); + else { + journal_directory_vacuum(".", 3000000, 0, NULL, true); + + assert_se(rm_rf_dangerous(t, false, true, false) >= 0); + } + + puts("------------------------------------------------------------"); +} + +static void test_empty(void) { + JournalFile *f1, *f2, *f3, *f4; + char t[] = "/tmp/journal-XXXXXX"; + + log_set_max_level(LOG_DEBUG); + + assert_se(mkdtemp(t)); + assert_se(chdir(t) >= 0); + + assert_se(journal_file_open("test.journal", O_RDWR|O_CREAT, 0666, false, false, NULL, NULL, NULL, &f1) == 0); + + assert_se(journal_file_open("test-compress.journal", O_RDWR|O_CREAT, 0666, true, false, NULL, NULL, NULL, &f2) == 0); + + assert_se(journal_file_open("test-seal.journal", O_RDWR|O_CREAT, 0666, false, true, NULL, NULL, NULL, &f3) == 0); + + assert_se(journal_file_open("test-seal-compress.journal", O_RDWR|O_CREAT, 0666, true, true, NULL, NULL, NULL, &f4) == 0); + + journal_file_print_header(f1); + puts(""); + journal_file_print_header(f2); + puts(""); + journal_file_print_header(f3); + puts(""); + journal_file_print_header(f4); + puts(""); + + log_info("Done..."); + + if (arg_keep) + log_info("Not removing %s", t); + else { + journal_directory_vacuum(".", 3000000, 0, NULL, true); + + assert_se(rm_rf_dangerous(t, false, true, false) >= 0); + } + + journal_file_close(f1); + journal_file_close(f2); + journal_file_close(f3); + journal_file_close(f4); +} + +int main(int argc, char *argv[]) { + arg_keep = argc > 1; - log_error("Exiting..."); + /* journal_file_open requires a valid machine id */ + if (access("/etc/machine-id", F_OK) != 0) + return EXIT_TEST_SKIP; - assert_se(rm_rf_dangerous(t, false, true, false) >= 0); + test_non_empty(); + test_empty(); return 0; }